Merge pull request #30 from jeremy379/revert-29-revert-27-dev/get-cla…

…ims-with-scopes Revert "Revert "Add scope filter to getClaims()""
jeremy379 · Sep 19, 2024 · b090623 · b090623
2 parents edd7d40 + 31420d7
commit b090623
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Claims/Claimable.php b/src/Claims/Claimable.php
@@ -5,7 +5,9 @@
 interface Claimable
 {
     /**
+     * @param string[] $scopes Optional scope filter
+     *
      * @return string[]
      */
-    public function getClaims(): array;
+    public function getClaims(array $scopes = []): array;
 }
diff --git a/src/Claims/Traits/WithClaims.php b/src/Claims/Traits/WithClaims.php
@@ -10,9 +10,11 @@ trait WithClaims
     protected array $claims;
 
     /**
+     * @param string[] $scopes Optional scope filter
+     *
      * @return string[]
      */
-    public function getClaims(): array
+    public function getClaims(array $scopes = []): array
     {
         return $this->claims;
     }

diff --git a/src/Entities/IdentityEntity.php b/src/Entities/IdentityEntity.php
@@ -12,9 +12,11 @@ class IdentityEntity implements IdentityEntityInterface
     use WithClaims;
 
     /**
+     * @param string[] $scopes Optional scope filter
+     *
      * @return string[]
      */
-    public function getClaims(): array
+    public function getClaims(array $scopes = []): array
     {
         /**
          * For a complete list of default claim sets

diff --git a/src/IdTokenResponse.php b/src/IdTokenResponse.php
@@ -113,7 +113,7 @@ protected function getExtraParams(AccessTokenEntityInterface $accessToken): arra
 
         $claims = $this->claimExtractor->extract(
             $scopes,
-            $user->getClaims(),
+            $user->getClaims(explode(' ', $params['scope'])),
         );
 
         foreach ($claims as $claimName => $claimValue) {