Change OAuth\Event\AfterGrantAccessEvent

Author: Vragov Roman

composer.json

@@ -22,10 +22,7 @@
   "autoload": {
     "psr-4": {
       "OAuth\\": "src"
-    },
-    "exclude-from-classmap": [
-      "tests"
-    ]
+    }
   },
   "autoload-dev": {
     "psr-4": {

src/Event/AfterGrantAccessEvent.php

@@ -4,11 +4,13 @@
 
 namespace OAuth\Event;
 
+use OAuth\Server\GrantExtension\Grant;
+
 class AfterGrantAccessEvent
 {
     public function __construct(
         private readonly string $grantType,
-        private readonly array $stored
+        private readonly Grant $grant,
     ) {
     }
 
@@ -17,8 +19,8 @@ public function getGrantType(): string
         return $this->grantType;
     }
 
-    public function getStored(): array
+    public function getGrant(): Grant
     {
-        return $this->stored;
+        return $this->grant;
     }
 }

src/Server/Handler.php

@@ -154,6 +154,7 @@ public function grantAccessToken(Request $request): Response
         ];
 
         $input = filter_var_array($inputData, $filters);
+        $input += $inputData;
 
         if (!$input['grant_type']) {
             throw new OAuthServerException(Response::HTTP_BAD_REQUEST, ErrorCode::ERROR_INVALID_REQUEST, 'Invalid grant_type parameter or parameter missing');
@@ -212,11 +213,7 @@ public function grantAccessToken(Request $request): Response
             ),
         };
 
-        $stored = [
-            'scope' => $this->config->getVariable(Config::CONFIG_SUPPORTED_SCOPES),
-        ];
-
-        $this->eventDispatcher->dispatch(new AfterGrantAccessEvent($input['grant_type'], $stored));
+        $this->eventDispatcher->dispatch(new AfterGrantAccessEvent($input['grant_type'], $grant));
 
         $scope = $grant->getScope();
         if ($input['scope']) {