Restore full functionality of OAuth2 server [skip ci]

api/components/OAuth2/Entities/AccessTokenEntity.php

@@ -1,44 +1,32 @@
 <?php
+declare(strict_types=1);
+
 namespace api\components\OAuth2\Entities;
 
-use api\components\OAuth2\Repositories\SessionStorage;
-use ErrorException;
-use League\OAuth2\Server\Entity\SessionEntity as OriginalSessionEntity;
+use api\components\Tokens\TokensFactory;
+use League\OAuth2\Server\CryptKeyInterface;
+use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
+use League\OAuth2\Server\Entities\Traits\TokenEntityTrait;
 
-class AccessTokenEntity extends \League\OAuth2\Server\Entity\AccessTokenEntity {
-
-    protected $sessionId;
-
-    public function getSessionId() {
-        return $this->sessionId;
+class AccessTokenEntity implements AccessTokenEntityInterface {
+    use EntityTrait;
+    use TokenEntityTrait {
+        getExpiryDateTime as parentGetExpiryDateTime;
     }
 
-    public function setSessionId($sessionId) {
-        $this->sessionId = $sessionId;
+    public function __toString(): string {
+        // TODO: strip "offline_access" scope from the scopes list
+        return (string)TokensFactory::createForOAuthClient($this);
     }
 
-    /**
-     * @inheritdoc
-     * @return static
-     */
-    public function setSession(OriginalSessionEntity $session) {
-        parent::setSession($session);
-        $this->sessionId = $session->getId();
-
-        return $this;
+    public function setPrivateKey(CryptKeyInterface $privateKey): void {
+        // We use a general-purpose component to build JWT tokens, so there is no need to keep the key
     }
 
-    public function getSession() {
-        if ($this->session instanceof OriginalSessionEntity) {
-            return $this->session;
-        }
-
-        $sessionStorage = $this->server->getSessionStorage();
-        if (!$sessionStorage instanceof SessionStorage) {
-            throw new ErrorException('SessionStorage must be instance of ' . SessionStorage::class);
-        }
-
-        return $sessionStorage->getById($this->sessionId);
+    public function getExpiryDateTime() {
+        // TODO: extend token life depending on scopes list
+        return $this->parentGetExpiryDateTime();
     }
 
 }

api/components/OAuth2/Entities/AuthCodeEntity.php

@@ -13,6 +13,4 @@ class AuthCodeEntity implements AuthCodeEntityInterface {
     use AuthCodeTrait;
     use TokenEntityTrait;
 
-    // TODO: constructor
-
 }

api/components/OAuth2/Entities/ClientEntity.php

@@ -11,11 +11,24 @@ class ClientEntity implements ClientEntityInterface {
     use EntityTrait;
     use ClientTrait;
 
-    public function __construct(string $id, string $name, $redirectUri, bool $isTrusted = false) {
+    /**
+     * @var bool
+     */
+    private $isTrusted;
+
+    public function __construct(string $id, string $name, $redirectUri, bool $isTrusted) {
         $this->identifier = $id;
         $this->name = $name;
         $this->redirectUri = $redirectUri;
-        $this->isConfidential = $isTrusted;
+        $this->isTrusted = $isTrusted;
+    }
+
+    public function isConfidential(): bool {
+        return true;
+    }
+
+    public function isTrusted(): bool {
+        return $this->isTrusted;
     }
 
 }

api/components/OAuth2/Entities/SessionEntity.php

@@ -1,27 +0,0 @@
-<?php
-namespace api\components\OAuth2\Entities;
-
-use League\OAuth2\Server\Entity\ClientEntity as OriginalClientEntity;
-use League\OAuth2\Server\Entity\EntityTrait;
-
-class SessionEntity extends \League\OAuth2\Server\Entity\SessionEntity {
-    use EntityTrait;
-
-    protected $clientId;
-
-    public function getClientId() {
-        return $this->clientId;
-    }
-
-    public function associateClient(OriginalClientEntity $client) {
-        parent::associateClient($client);
-        $this->clientId = $client->getId();
-
-        return $this;
-    }
-
-    public function setClientId(string $clientId) {
-        $this->clientId = $clientId;
-    }
-
-}

api/components/OAuth2/Entities/UserEntity.php

@@ -9,7 +9,7 @@ use League\OAuth2\Server\Entities\UserEntityInterface;
 class UserEntity implements UserEntityInterface {
     use EntityTrait;
 
-    public function __construct($id) {
+    public function __construct(int $id) {
         $this->identifier = $id;
     }