Merge pull request #15 from moufmouf/configurable-iss

Making the issuer configurable.
ronvanderheijden · Apr 19, 2024 · 81f3d70 · 81f3d70
2 parents cd4b1e4 + da5191d
commit 81f3d70
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/IdTokenResponse.php b/src/IdTokenResponse.php
@@ -21,15 +21,18 @@ class IdTokenResponse extends BearerTokenResponse
     protected ClaimExtractor $claimExtractor;
 
     private Configuration $config;
+    private ?string $issuer;
 
     public function __construct(
         IdentityRepositoryInterface $identityRepository,
         ClaimExtractor $claimExtractor,
-        Configuration $config
+        Configuration $config,
+        string $issuer = null,
     ) {
         $this->identityRepository = $identityRepository;
         $this->claimExtractor = $claimExtractor;
         $this->config = $config;
+        $this->issuer = $issuer;
     }
 
     protected function getBuilder(
@@ -41,7 +44,7 @@ protected function getBuilder(
         return $this->config
             ->builder()
             ->permittedFor($accessToken->getClient()->getIdentifier())
-            ->issuedBy('https://' . $_SERVER['HTTP_HOST'])
+            ->issuedBy($this->issuer ?? 'https://' . $_SERVER['HTTP_HOST'])
             ->issuedAt($dateTimeImmutableObject)
             ->expiresAt($dateTimeImmutableObject->add(new DateInterval('PT1H')))
             ->relatedTo($userEntity->getIdentifier());

diff --git a/src/Laravel/PassportServiceProvider.php b/src/Laravel/PassportServiceProvider.php
@@ -55,6 +55,7 @@ public function makeAuthorizationServer(): AuthorizationServer
                 app(config('openid.signer')),
                 InMemory::file($cryptKey->getKeyPath()),
             ),
+            app('request')->getSchemeAndHttpHost(),
         );
 
         return new AuthorizationServer(

diff --git a/tests/Factories/IdTokenResponseFactory.php b/tests/Factories/IdTokenResponseFactory.php
@@ -16,26 +16,30 @@ private function build(
         IdentityRepositoryInterface $identityRepository,
         ClaimExtractor $claimExtractor,
         ?Configuration $config = null,
+        ?string $issuer = null,
     ): BearerTokenResponse {
         return new IdTokenResponse(
             $identityRepository,
             $claimExtractor,
             $config ?? ConfigutationFactory::default(),
+            $issuer,
         );
     }
 
     public static function default(
         IdentityRepositoryInterface $identityRepository,
         ClaimExtractor $claimExtractor,
+        ?string $issuer = null,
     ): BearerTokenResponse {
-        return (new static())->build($identityRepository, $claimExtractor);
+        return (new static())->build($identityRepository, $claimExtractor, null, $issuer);
     }
 
     public static function withConfig(
         IdentityRepositoryInterface $identityRepository,
         ClaimExtractor $claimExtractor,
-        Configuration $config
+        Configuration $config,
+        ?string $issuer = null,
     ): BearerTokenResponse {
-        return (new static())->build($identityRepository, $claimExtractor, $config);
+        return (new static())->build($identityRepository, $claimExtractor, $config, $issuer);
     }
 }