Upgrade to 8

Author: Shaun John Cheetham

composer.json

@@ -13,6 +13,7 @@
         "designmynight"
     ],
     "require": {
+        "ext-mongodb": "*",
         "illuminate/support": "^5.5 || ^6.0",
         "jenssegers/mongodb": "3.3.* || 3.4.* || 3.5.* || 3.6.*",
         "laravel/passport": "4.0.* || 5.0.* || 6.0.* || 7.0.* || 7.4.* || 7.5.* || ^8.0"

src/MongodbPassportServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace DesignMyNight\Mongodb;
 
+use DesignMyNight\Mongodb\Passport\Bridge\RefreshTokenRepository as BridgeRefreshTokenRepository;
+use DesignMyNight\Mongodb\Passport\RefreshTokenRepository;
 use Illuminate\Support\ServiceProvider;
 use DesignMyNight\Mongodb\Passport\AuthCode;
 use DesignMyNight\Mongodb\Passport\Client;
@@ -10,22 +12,53 @@
 
 class MongodbPassportServiceProvider extends ServiceProvider
 {
+    /** @var string */
+    private $method = 'alias';
+
+    /** @var array */
+    private $aliases = [
+        'Laravel\Passport\AuthCode' => AuthCode::class,
+        'Laravel\Passport\Bridge\RefreshTokenRepository' => BridgeRefreshTokenRepository::class,
+        'Laravel\Passport\Client' => Client::class,
+        'Laravel\Passport\PersonalAccessClient' => PersonalAccessClient::class,
+        'Laravel\Passport\RefreshTokenRepository' => RefreshTokenRepository::class,
+        'Laravel\Passport\Token' => Token::class,
+    ];
+
+    /** @var Illuminate\Foundation\AliasLoader */
+    private $loader;
+
+    /**
+     * @return void
+     */
     public function register()
     {
-        /*
-         * Passport client extends Eloquent model by default, so we alias them.
-         */
-        if (class_exists('Illuminate\Foundation\AliasLoader')) {
-            $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-            $loader->alias('Laravel\Passport\AuthCode', AuthCode::class);
-            $loader->alias('Laravel\Passport\Client', Client::class);
-            $loader->alias('Laravel\Passport\PersonalAccessClient', PersonalAccessClient::class);
-            $loader->alias('Laravel\Passport\Token', Token::class);
-        } else {
-            class_alias('Laravel\Passport\AuthCode', AuthCode::class);
-            class_alias('Laravel\Passport\Client', Client::class);
-            class_alias('Laravel\Passport\PersonalAccessClient', PersonalAccessClient::class);
-            class_alias('Laravel\Passport\Token', Token::class);
+        if (class_exists($loader = 'Illuminate\Foundation\AliasLoader')) {
+            $this->loader = $loader::getInstance();
+            $this->method = 'loadAlias';
         }
+
+        foreach ($this->aliases as $original => $alias) {
+            $this->{$this->method}($original, $alias);
+        }
+    }
+
+    /**
+     * @param string $original
+     * @param string $alias
+     */
+    private function alias(string $original, string $alias): void
+    {
+        class_alias($original, $alias);
+    }
+
+    /**
+     * @param string $original
+     * @param string $alias
+     */
+    private function loadAlias(string $original, string $alias): void
+    {
+        // Passport client extends Eloquent model by default, so we alias them.
+        $this->loader->alias($original, $alias);
     }
 }

src/Passport/Bridge/RefreshTokenRepository.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace DesignMyNight\Mongodb\Passport\Bridge;
+
+use Laravel\Passport\Bridge\RefreshTokenRepository as BaseRefreshTokenRepository;
+use Laravel\Passport\Events\RefreshTokenCreated;
+use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
+use MongoDB\BSON\UTCDateTime;
+
+/**
+ * Class RefreshTokenRepository
+ * @package App\Passport\Bridge
+ */
+class RefreshTokenRepository extends BaseRefreshTokenRepository
+{
+    /**
+     * @inheritDoc
+     */
+    public function persistNewRefreshToken(RefreshTokenEntityInterface $refreshTokenEntity)
+    {
+        $this->refreshTokenRepository->create([
+            'id' => $id = $refreshTokenEntity->getIdentifier(),
+            'access_token_id' => $accessTokenId = $refreshTokenEntity->getAccessToken()->getIdentifier(),
+            'revoked' => false,
+            'expires_at' => new UTCDateTime($refreshTokenEntity->getExpiryDateTime()->getTimestamp() * 1000),
+        ]);
+
+        $this->events->dispatch(new RefreshTokenCreated($id, $accessTokenId));
+    }
+}

src/Passport/Client.php

@@ -79,4 +79,14 @@ public function skipsAuthorization()
     {
         return false;
     } 
+	
+	/**
+     * Determine if the client is a confidential client.
+     *
+     * @return bool
+     */
+    public function confidential()
+    {
+        return ! empty($this->secret);
+    }
 }

src/Passport/RefreshTokenRepository.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace DesignMyNight\Mongodb\Passport;
+
+use Laravel\Passport\RefreshTokenRepository as BaseRefreshTokenRepository;
+
+class RefreshTokenRepository extends BaseRefreshTokenRepository
+{
+    /**
+     * Checks if the refresh token has been revoked.
+     *
+     * @param  string  $id
+     * @return bool
+     */
+    public function isRefreshTokenRevoked($id)
+    {
+        if ($token = $this->find($id)) {
+            return $token['revoked'];
+        }
+
+        return true;
+    }
+}