Merge pull request #152 from pdsinterop/fix/register-port-number

Fix/register port number
pdsinterop · Feb 13, 2024 · 1f46e74 · 1f46e74
2 parents 3854755 + eab34dd
commit 1f46e74
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/solid/lib/Controller/ServerController.php b/solid/lib/Controller/ServerController.php
@@ -184,8 +184,10 @@ public function authorize() {
 
 		if (preg_match("/^http(s)?:/", $getVars['client_id'])) {
 			$parsedOrigin = parse_url($getVars['redirect_uri']);
-			$origin = 'https://' . $parsedOrigin['host'];
-
+			$origin = $parsedOrigin['scheme'] . '://' . $parsedOrigin['host'];
+			if (isset($parsedOrigin['port'])) {
+				$origin .= ":" . $parsedOrigin['port'];
+			}
 			$clientData = array(
 				"client_id_issued_at" => time(),
 				"client_name" => $getVars['client_id'],
@@ -336,7 +338,10 @@ public function register() {
 		}
 		$clientData['client_id_issued_at'] = time();
 		$parsedOrigin = parse_url($clientData['redirect_uris'][0]);
-		$origin = 'https://' . $parsedOrigin['host'];
+		$origin = $parsedOrigin['scheme'] . '://' . $parsedOrigin['host'];
+		if (isset($parsedOrigin['port'])) {
+			$origin .= ":" . $parsedOrigin['port'];
+		}
 
 		$clientId = $this->config->saveClientRegistration($origin, $clientData);
 		$registration = array(