wip

laravel · Dec 10, 2024 · 1e79f26 · 1e79f26
1 parent 67fde5f
commit 1e79f26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Bridge/PersonalAccessGrant.php b/src/Bridge/PersonalAccessGrant.php
@@ -6,6 +6,8 @@
 use Laravel\Passport\Passport;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Grant\AbstractGrant;
+use League\OAuth2\Server\RequestAccessTokenEvent;
+use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -48,6 +50,10 @@ public function respondToAccessTokenRequest(
             $scopes
         );
 
+        // Send event to emitter
+        $this->getEmitter()->emit(new RequestAccessTokenEvent(RequestEvent::ACCESS_TOKEN_ISSUED, $request, $accessToken));
+
+        // Persist access token's name
         Passport::token()->newQuery()->whereKey($accessToken->getIdentifier())->update([
             'name' => $this->getRequestParameter('name', $request),
         ]);

diff --git a/src/Http/Middleware/EnsureClientIsResourceOwner.php b/src/Http/Middleware/EnsureClientIsResourceOwner.php
@@ -15,7 +15,7 @@ class EnsureClientIsResourceOwner extends ValidateToken
      */
     protected function validate(AccessToken $token, string ...$params): void
     {
-        if ($token->oauth_user_id !== $token->oauth_client_id) {
+        if (! is_null($token->oauth_user_id) && $token->oauth_user_id !== $token->oauth_client_id) {
             throw new AuthenticationException;
         }