Pass user identifier through to finalize scopes in personal access gr…

…ant (#1650)
laravel · Apr 4, 2023 · 5417fe8 · 5417fe8
1 parent ef5fa30
commit 5417fe8
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Bridge/PersonalAccessGrant.php b/src/Bridge/PersonalAccessGrant.php
@@ -20,14 +20,22 @@ public function respondToAccessTokenRequest(
         // Validate request
         $client = $this->validateClient($request);
         $scopes = $this->validateScopes($this->getRequestParameter('scope', $request));
+        $userIdentifier = $this->getRequestParameter('user_id', $request);
 
         // Finalize the requested scopes
-        $scopes = $this->scopeRepository->finalizeScopes($scopes, $this->getIdentifier(), $client);
+        $scopes = $this->scopeRepository->finalizeScopes(
+            $scopes,
+            $this->getIdentifier(),
+            $client,
+            $userIdentifier
+        );
 
         // Issue and persist access token
         $accessToken = $this->issueAccessToken(
-            $accessTokenTTL, $client,
-            $this->getRequestParameter('user_id', $request), $scopes
+            $accessTokenTTL,
+            $client,
+            $userIdentifier,
+            $scopes
         );
 
         // Inject access token into response type