Update base url of openid configuration loader (#35)

* Update base url * Update tests
minvws · Feb 13, 2024 · abfc107 · abfc107
1 parent 696ebe1
commit abfc107
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/OpenIDConfiguration/OpenIDConfigurationLoader.php b/src/OpenIDConfiguration/OpenIDConfigurationLoader.php
@@ -38,11 +38,11 @@ protected function getConfigurationFromIssuer(): OpenIDConfiguration
     {
         $url = $this->getOpenIDConfigurationUrl();
 
-        $pendingRequest = Http::baseUrl($url);
-        if (!$this->tlsVerify) {
-            $pendingRequest->withoutVerifying();
-        }
-        $response = $pendingRequest->get($url);
+        $response = Http::baseUrl($this->issuer)
+            ->when(!$this->tlsVerify, function ($pendingRequest) {
+                return $pendingRequest->withoutVerifying();
+            })
+            ->get($url);
 
         if (!$response->successful()) {
             throw new OpenIDConfigurationLoaderException(
@@ -97,6 +97,6 @@ protected function getConfigurationFromIssuer(): OpenIDConfiguration
 
     protected function getOpenIDConfigurationUrl(): string
     {
-        return $this->issuer . '/.well-known/openid-configuration';
+        return '/.well-known/openid-configuration';
     }
 }
diff --git a/tests/Feature/OpenIDConfiguration/OpenIDConfigurationLoaderTest.php b/tests/Feature/OpenIDConfiguration/OpenIDConfigurationLoaderTest.php
@@ -118,7 +118,7 @@ public function testLoaderThrowsExceptionWhenProviderReturns400ResponseCodeAsser
 
             $context = $exception->context();
             $this->assertSame("https://provider.rdobeheer.nl", $context['issuer']);
-            $this->assertSame("https://provider.rdobeheer.nl/.well-known/openid-configuration", $context['url']);
+            $this->assertSame("/.well-known/openid-configuration", $context['url']);
             $this->assertSame(400, $context['response_status_code']);
         }
     }
@@ -137,7 +137,7 @@ public function testLoaderThrowsExceptionWhenProviderReturns500ResponseCodeAsser
 
             $context = $exception->context();
             $this->assertSame("https://provider.rdobeheer.nl", $context['issuer']);
-            $this->assertSame("https://provider.rdobeheer.nl/.well-known/openid-configuration", $context['url']);
+            $this->assertSame("/.well-known/openid-configuration", $context['url']);
             $this->assertSame(500, $context['response_status_code']);
         }
     }
@@ -156,7 +156,7 @@ public function testLoaderThrowsExceptionWhenProviderReturns200ButNullResponse()
 
             $context = $exception->context();
             $this->assertSame("https://provider.rdobeheer.nl", $context['issuer']);
-            $this->assertSame("https://provider.rdobeheer.nl/.well-known/openid-configuration", $context['url']);
+            $this->assertSame("/.well-known/openid-configuration", $context['url']);
             $this->assertSame(200, $context['response_status_code']);
             $this->assertSame('', $context['response_body']);
         }
@@ -176,7 +176,7 @@ public function testLoaderThrowsExceptionWhenProviderReturns200ButStringResponse
 
             $context = $exception->context();
             $this->assertSame("https://provider.rdobeheer.nl", $context['issuer']);
-            $this->assertSame("https://provider.rdobeheer.nl/.well-known/openid-configuration", $context['url']);
+            $this->assertSame("/.well-known/openid-configuration", $context['url']);
             $this->assertSame(200, $context['response_status_code']);
             $this->assertSame('some invalid response', $context['response_body']);
         }