Fix PHPStan errors

lucadegasperi · Jan 17, 2024 · 76cb886 · 76cb886
1 parent 93157f4
commit 76cb886
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 186 deletions.
diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
@@ -22,7 +22,6 @@
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequestInterface;
-use League\OAuth2\Server\RequestTypes\DeviceAuthorizationRequest;
 use League\OAuth2\Server\ResponseTypes\AbstractResponseType;
 use League\OAuth2\Server\ResponseTypes\BearerTokenResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;

diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
@@ -38,7 +38,6 @@
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
 use League\OAuth2\Server\RequestEvent;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequestInterface;
-use League\OAuth2\Server\RequestTypes\DeviceAuthorizationRequest;
 use League\OAuth2\Server\ResponseTypes\DeviceCodeResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use LogicException;
@@ -552,7 +551,7 @@ public function respondToDeviceAuthorizationRequest(ServerRequestInterface $requ
     /**
      * {@inheritdoc}
      */
-    public function completeDeviceAuthorizationRequest(string $deviceCode, string|int $userId, bool $userApproved): void
+    public function completeDeviceAuthorizationRequest(string $deviceCode, string $userId, bool $userApproved): void
     {
         throw new LogicException('This grant cannot complete a device authorization request');
     }

diff --git a/src/Grant/DeviceCodeGrant.php b/src/Grant/DeviceCodeGrant.php
@@ -26,7 +26,6 @@
 use League\OAuth2\Server\Repositories\DeviceCodeRepositoryInterface;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 use League\OAuth2\Server\RequestEvent;
-use League\OAuth2\Server\RequestTypes\DeviceAuthorizationRequest;
 use League\OAuth2\Server\ResponseTypes\DeviceCodeResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use LogicException;
@@ -122,10 +121,19 @@ public function respondToDeviceAuthorizationRequest(ServerRequestInterface $requ
     /**
      * {@inheritdoc}
      */
-    public function completeDeviceAuthorizationRequest(string $deviceCode, string|int $userId, bool $approved): void
+    // TODO: Make sure this cant be abused to try and brute force a device code
+    public function completeDeviceAuthorizationRequest(string $deviceCode, string $userId, bool $approved): void
     {
         $deviceCode = $this->deviceCodeRepository->getDeviceCodeEntityByDeviceCode($deviceCode);
 
+        if ($deviceCode instanceof DeviceCodeEntityInterface === false) {
+            throw OAuthServerException::invalidRequest('device_code', 'Device code does not exist');
+        }
+
+        if ($userId === '') {
+            throw OAuthServerException::invalidRequest('user_id', 'User ID is required');
+        }
+
         $deviceCode->setUserIdentifier($userId);
         $deviceCode->setUserApproved($approved);
 
@@ -210,21 +218,19 @@ protected function validateDeviceCode(ServerRequestInterface $request, ClientEnt
         }
 
         $deviceCode = $this->deviceCodeRepository->getDeviceCodeEntityByDeviceCode(
-            $deviceCodePayload->device_code_id,
-            $this->getIdentifier(),
-            $client
+            $deviceCodePayload->device_code_id
         );
 
-        if ($this->deviceCodePolledTooSoon($deviceCode->getLastPolledAt()) === true) {
-            throw OAuthServerException::slowDown();
-        }
-
         if ($deviceCode instanceof DeviceCodeEntityInterface === false) {
             $this->getEmitter()->emit(new RequestEvent(RequestEvent::USER_AUTHENTICATION_FAILED, $request));
 
             throw OAuthServerException::invalidGrant();
         }
 
+        if ($this->deviceCodePolledTooSoon($deviceCode->getLastPolledAt()) === true) {
+            throw OAuthServerException::slowDown();
+        }
+
         return $deviceCode;
     }
 
@@ -312,6 +318,10 @@ protected function issueDeviceCode(
                 }
             }
         }
+
+
+        // This should never be hit. It is here to work around a PHPStan false error
+        return $deviceCode;
     }
 
     /**

diff --git a/src/Grant/GrantTypeInterface.php b/src/Grant/GrantTypeInterface.php
@@ -22,7 +22,6 @@
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequestInterface;
-use League\OAuth2\Server\RequestTypes\DeviceAuthorizationRequest;
 use League\OAuth2\Server\ResponseTypes\DeviceCodeResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -103,7 +102,7 @@ public function respondToDeviceAuthorizationRequest(ServerRequestInterface $requ
      *
      * If the validation is successful a DeviceCode object is persisted.
      */
-    public function completeDeviceAuthorizationRequest(string $deviceCode, string|int $userId, bool $userApproved): void;
+    public function completeDeviceAuthorizationRequest(string $deviceCode, string $userId, bool $userApproved): void;
 
     /**
      * Set the client repository.

diff --git a/src/Middleware/DeviceGrantMiddleware.php b/src/Middleware/DeviceGrantMiddleware.php
diff --git a/src/Repositories/DeviceCodeRepositoryInterface.php b/src/Repositories/DeviceCodeRepositoryInterface.php
@@ -27,15 +27,12 @@ public function getNewDeviceCode(): DeviceCodeEntityInterface;
     /**
      * Persists a device code to permanent storage.
      *
-     *
      * @throws UniqueTokenIdentifierConstraintViolationException
      */
     public function persistDeviceCode(DeviceCodeEntityInterface $deviceCodeEntity): void;
 
     /**
      * Get a device code entity.
-     *
-     *
      */
     public function getDeviceCodeEntityByDeviceCode(
         string $deviceCode

diff --git a/src/RequestTypes/DeviceAuthorizationRequest.php b/src/RequestTypes/DeviceAuthorizationRequest.php
diff --git a/src/ResponseTypes/DeviceCodeResponse.php b/src/ResponseTypes/DeviceCodeResponse.php
@@ -70,7 +70,7 @@ public function setPayload(string $payload): void
     /**
      * {@inheritdoc}
      */
-    public function setDeviceCode(DeviceCodeEntityInterface $deviceCode)
+    public function setDeviceCode(DeviceCodeEntityInterface $deviceCode): void
     {
         $this->deviceCode = $deviceCode;
     }