Skip to content

Commit fc2686f

Browse files
committed
return client_secret in the registration
1 parent 6457465 commit fc2686f

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

solid/lib/Controller/ServerController.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,11 @@ public function register() {
343343
$origin .= ":" . $parsedOrigin['port'];
344344
}
345345

346-
$clientId = $this->config->saveClientRegistration($origin, $clientData);
346+
$clientData = $this->config->saveClientRegistration($origin, $clientData);
347347
$registration = array(
348-
'client_id' => $clientId,
349-
'registration_client_uri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.server.registeredClient", array("clientId" => $clientId))),
348+
'client_id' => $clientData['client_id'],
349+
'client_secret' => $clientData['client_secret'],
350+
'registration_client_uri' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute("solid.server.registeredClient", array("clientId" => $clientData['client_id']))),
350351
'client_id_issued_at' => $clientData['client_id_issued_at'],
351352
'redirect_uris' => $clientData['redirect_uris'],
352353
);
@@ -413,7 +414,7 @@ private function getClient($clientId) {
413414
if ($clientId && count($clientRegistration)) {
414415
return new \Pdsinterop\Solid\Auth\Config\Client(
415416
$clientId,
416-
$clientRegistration['client_secret'],
417+
$clientRegistration['client_secret'] ?? '',
417418
$clientRegistration['redirect_uris'],
418419
$clientRegistration['client_name']
419420
);

solid/lib/ServerConfig.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,13 @@ public function saveClientRegistration($origin, $clientData) {
126126
$clientData['redirect_uris'] = array_unique($clientData['redirect_uris']);
127127
}
128128

129+
$clientData['client_id'] = $originHash;
129130
$clientData['client_name'] = $origin;
130131
$clientData['client_secret'] = md5(random_bytes(32));
131132
$this->config->setAppValue('solid', "client-" . $originHash, json_encode($clientData));
132133

133134
$this->config->setAppValue('solid', "client-" . $origin, json_encode($clientData));
134-
return $originHash;
135+
return $clientData;
135136
}
136137

137138
public function removeClientRegistration($clientId) {

0 commit comments

Comments
 (0)