Laravel 9

Author: overtrue

.github/workflows/ci.yml

@@ -12,14 +12,10 @@ jobs:
           - 7.4
         perfer:
           - stable
-    container:
-      image: nauxliu/php-ci-image:${{ matrix.php_version }}
     steps:
       - uses: actions/checkout@master
       - name: Install Dependencies
         run: composer install --prefer-dist --no-interaction --no-suggest
-      - name: Run PHP-CS-Fxier
-        run: composer check-style
 
   phpunit:
     name: phpunit
@@ -28,13 +24,11 @@ jobs:
       fail-fast: false
       matrix:
         php_version:
-          - 7.3
           - 7.4
           - 8.0
+          - 8.1
         perfer:
           - stable
-    container:
-      image: nauxliu/php-ci-image:${{ matrix.php_version }}
     steps:
       - uses: actions/checkout@master
       - name: Install Dependencies
@@ -52,8 +46,6 @@ jobs:
           - 7.4
         perfer:
           - stable
-    container:
-      image: nauxliu/php-ci-image:${{ matrix.php_version }}
     steps:
       - uses: actions/checkout@master
       - name: Install laravel/framework:^6.0

README.md

@@ -2,6 +2,8 @@
 
 Make [laravel/passport](https://github.com/laravel/passport) token cacheable.
 
+[![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me-button-s.svg?raw=true)](https://github.com/sponsors/overtrue)
+
 
 ## Installing
 
@@ -33,6 +35,20 @@ return [
 ];
 ```
 
+
+## :heart: Sponsor me 
+
+[![Sponsor me](https://github.com/overtrue/overtrue/blob/master/sponsor-me.svg?raw=true)](https://github.com/sponsors/overtrue)
+
+如果你喜欢我的项目并想支持它，[点击这里 :heart:](https://github.com/sponsors/overtrue)
+
+
+## Project supported by JetBrains
+
+Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects.
+
+[![](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/?from=https://github.com/overtrue)
+
 ## Contributing
 
 You can contribute in one of three ways:

phpunit.xml.dist

@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Application Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/CacheTokenRepository.php

@@ -53,9 +53,9 @@ public function __construct(string $cacheKeyPrefix = null, int $expiresInSeconds
      *
      * @return \Laravel\Passport\Token
      */
-    public function find($id)
+    public function find($id): ?Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($id),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($id) {
@@ -72,9 +72,9 @@ function () use ($id) {
      *
      * @return \Laravel\Passport\Token|null
      */
-    public function findForUser($id, $userId)
+    public function findForUser($id, $userId): ?Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($id),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($id, $userId) {
@@ -92,7 +92,7 @@ function () use ($id, $userId) {
      */
     public function forUser($userId): Collection
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($userId),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($userId) {
@@ -109,9 +109,9 @@ function () use ($userId) {
      *
      * @return \Laravel\Passport\Token|null
      */
-    public function getValidToken($user, $client)
+    public function getValidToken($user, $client): ?Token
     {
-        return $this->store()->remember(
+        return $this->cacheStore()->remember(
             $this->itemKey($user->getKey()),
             \now()->addSeconds($this->expiresInSeconds),
             function () use ($client, $user) {
@@ -124,15 +124,22 @@ function () use ($client, $user) {
         );
     }
 
-    public function itemKey(string $key)
+    public function itemKey(string $key): string
     {
         return $this->cacheKeyPrefix . $key;
     }
 
-    public function store(): Repository
+    public function cacheStore(): Repository
     {
         $store = Cache::store($this->cacheStore);
 
-        return $store instanceof TaggableStore ? $store->tags($this->cacheTags) : $store;
+        return $store->getStore() instanceof TaggableStore ? $store->tags($this->cacheTags) : $store;
+    }
+
+    public function revokeAccessToken($id)
+    {
+        parent::revokeAccessToken($id);
+
+        $this->cacheStore()->forget($this->itemKey($id));
     }
 }

tests/FeatureTest.php

@@ -2,12 +2,14 @@
 
 namespace Tests;
 
+use Illuminate\Auth\RequestGuard;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Contracts\Routing\Registrar;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
+use Laravel\Passport\TokenRepository;
 
 class FeatureTest extends TestCase
 {
@@ -54,43 +56,65 @@ public function test_it_can_cache_token()
         $user->password = $this->app->make(Hasher::class)->make($password);
         $user->save();
 
+        $tokenRepository = app(TokenRepository::class);
+
         /** @var Client $client */
-        app(ClientRepository::class)->createPersonalAccessClient($user->id, 'Personal Token Client', 'http://localhost');
+        $client = app(ClientRepository::class)->createPersonalAccessClient($user->id, 'Personal Token Client', 'http://localhost');
 
         /** @var Registrar $router */
         $router = $this->app->make(Registrar::class);
 
-        $token = $user->createToken('test')->accessToken;
+        $accessToken = $user->createToken('test')->accessToken;
 
         $router->get('/foo', function () {
             return 'bar';
         })->middleware('auth:api');
 
-        $query = $this->getQueryLog(function () use ($token, $user, $router) {
+        $query = $this->getQueryLog(function () use ($accessToken, $user, $router) {
             $this->getJson('/foo')->assertStatus(401);
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/foo')->assertSuccessful()->assertSee('bar');
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/foo')->assertSuccessful()->assertSee('bar');
         });
 
         $this->assertCount(3, $query);
 
         // token cached
-        $query = $this->getQueryLog(function () use ($token, $user, $router) {
+        $query = $this->getQueryLog(function () use ($accessToken, $user, $router) {
             $router->get('/me', function () {
                 return Auth::user();
             })->middleware('auth:api');
 
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/me')->assertSuccessful()->assertJsonFragment([
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertSuccessful()->assertJsonFragment([
                 'id' => $user->id,
                 'email' => $user->email,
             ]);
 
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/me')->assertOk();
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/me')->assertOk();
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/me')->assertOk();
-            $this->withHeader('Authorization', 'Bearer ' . $token)->getJson('/me')->assertOk();
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertOk();
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertOk();
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertOk();
+            $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertOk();
         });
 
         $this->assertCount(0, $query);
+
+
+        // revoke token
+        $token = $tokenRepository->findValidToken($user, $client);
+        $this->assertTrue($tokenRepository->cacheStore()->has(app(TokenRepository::class)->itemKey($token->id)));
+
+        $tokenRepository->revokeAccessToken($token->id);
+        $token->refresh();
+        $this->assertTrue($token->revoked);
+
+        $this->assertFalse($tokenRepository->cacheStore()->has($tokenRepository->itemKey($token->id)));
+
+        // logout
+        RequestGuard::macro('logout', function () {
+            $this->user = null;
+        });
+        Auth::guard('api')->logout();
+
+        // request with revoked token
+        $this->withHeader('Authorization', 'Bearer ' . $accessToken)->getJson('/me')->assertUnauthorized();
     }
 
     protected function getQueryLog(\Closure $callback): \Illuminate\Support\Collection