Skip to content

Commit 1f46e74

Browse files
authored
Merge pull request #152 from pdsinterop/fix/register-port-number
Fix/register port number
2 parents 3854755 + eab34dd commit 1f46e74

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

solid/lib/Controller/ServerController.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,10 @@ public function authorize() {
184184

185185
if (preg_match("/^http(s)?:/", $getVars['client_id'])) {
186186
$parsedOrigin = parse_url($getVars['redirect_uri']);
187-
$origin = 'https://' . $parsedOrigin['host'];
188-
187+
$origin = $parsedOrigin['scheme'] . '://' . $parsedOrigin['host'];
188+
if (isset($parsedOrigin['port'])) {
189+
$origin .= ":" . $parsedOrigin['port'];
190+
}
189191
$clientData = array(
190192
"client_id_issued_at" => time(),
191193
"client_name" => $getVars['client_id'],
@@ -336,7 +338,10 @@ public function register() {
336338
}
337339
$clientData['client_id_issued_at'] = time();
338340
$parsedOrigin = parse_url($clientData['redirect_uris'][0]);
339-
$origin = 'https://' . $parsedOrigin['host'];
341+
$origin = $parsedOrigin['scheme'] . '://' . $parsedOrigin['host'];
342+
if (isset($parsedOrigin['port'])) {
343+
$origin .= ":" . $parsedOrigin['port'];
344+
}
340345

341346
$clientId = $this->config->saveClientRegistration($origin, $clientData);
342347
$registration = array(

0 commit comments

Comments
 (0)