Added RequestEvent

src/Grant/AbstractGrant.php

@@ -11,7 +11,6 @@
 namespace League\OAuth2\Server\Grant;
 
 use League\Event\EmitterAwareTrait;
-use League\Event\Event;
 use League\OAuth2\Server\CryptTrait;
 use League\OAuth2\Server\Entities\AccessTokenEntity;
 use League\OAuth2\Server\Entities\AuthCodeEntity;
@@ -26,6 +25,7 @@ use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use League\OAuth2\Server\RequestEvent;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -167,7 +167,7 @@ abstract class AbstractGrant implements GrantTypeInterface
         );
 
         if (!$client instanceof ClientEntityInterface) {
-            $this->getEmitter()->emit(new Event('client.authentication.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('client.authentication.failed', $request));
             throw OAuthServerException::invalidClient();
         }
 

src/Grant/AuthCodeGrant.php

@@ -3,13 +3,13 @@
 namespace League\OAuth2\Server\Grant;
 
 use DateInterval;
-use League\Event\Event;
 use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
 use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\ResponseTypes\HtmlResponse;
 use League\OAuth2\Server\ResponseTypes\RedirectResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
@@ -72,7 +72,7 @@ class AuthCodeGrant extends AbstractAuthorizeGrant
         );
 
         if ($client instanceof ClientEntityInterface === false) {
-            $this->getEmitter()->emit(new Event('client.authentication.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('client.authentication.failed', $request));
             throw OAuthServerException::invalidClient();
         }
 

src/Grant/ImplicitGrant.php

@@ -2,11 +2,11 @@
 
 namespace League\OAuth2\Server\Grant;
 
-use League\Event\Event;
 use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
 use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\ResponseTypes\HtmlResponse;
 use League\OAuth2\Server\ResponseTypes\RedirectResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
@@ -68,14 +68,14 @@ class ImplicitGrant extends AbstractAuthorizeGrant
         );
 
         if ($client instanceof ClientEntityInterface === false) {
-            $this->getEmitter()->emit(new Event('client.authentication.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('client.authentication.failed', $request));
 
             throw OAuthServerException::invalidClient();
         }
 
         $redirectUriParameter = $this->getQueryStringParameter('redirect_uri', $request, $client->getRedirectUri());
         if ($redirectUriParameter !== $client->getRedirectUri()) {
-            $this->getEmitter()->emit(new Event('client.authentication.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('client.authentication.failed', $request));
 
             throw OAuthServerException::invalidClient();
         }

src/Grant/PasswordGrant.php

@@ -17,6 +17,7 @@ use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -92,7 +93,7 @@ class PasswordGrant extends AbstractGrant
             $scopes
         );
         if (!$user instanceof UserEntityInterface) {
-            $this->getEmitter()->emit(new Event('user.authentication.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('user.authentication.failed', $request));
 
             throw OAuthServerException::invalidCredentials();
         }

src/Grant/RefreshTokenGrant.php

@@ -10,9 +10,9 @@
  */
 namespace League\OAuth2\Server\Grant;
 
-use League\Event\Event;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
+use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -66,8 +66,6 @@ class RefreshTokenGrant extends AbstractGrant
             // the request doesn't include any new scopes
             foreach ($scopes as $scope) {
                 if (in_array($scope->getIdentifier(), $oldRefreshToken['scopes']) === false) {
-                    $this->getEmitter()->emit(new Event('scope.selection.failed', $request));
-
                     throw OAuthServerException::invalidScope($scope->getIdentifier());
                 }
             }
@@ -114,8 +112,7 @@ class RefreshTokenGrant extends AbstractGrant
 
         $refreshTokenData = json_decode($refreshToken, true);
         if ($refreshTokenData['client_id'] !== $clientId) {
-            $this->getEmitter()->emit(new Event('refresh_token.client.failed', $request));
+            $this->getEmitter()->emit(new RequestEvent('refresh_token.client.failed', $request));
-
             throw OAuthServerException::invalidRefreshToken(
                 'Token is not linked to client,' .
                 ' got: ' . $clientId .

src/RequestEvent.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace League\OAuth2\Server;
+
+use League\Event\Event;
+use Psr\Http\Message\ServerRequestInterface;
+
+class RequestEvent extends Event
+{
+    /**
+     * @var \Psr\Http\Message\ServerRequestInterface
+     */
+    private $request;
+
+    /**
+     * RequestEvent constructor.
+     *
+     * @param string                                   $name
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     */
+    public  function __construct($name, ServerRequestInterface $request)
+    {
+        parent::__construct($name);
+        $this->request = $request;
+    }
+
+    /**
+     * @return ServerRequestInterface
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+}