Add refreshTokensExpireIn and personalAccessTokensExpireIn methods

README.md

@@ -172,14 +172,16 @@ LumenPassport::allowMultipleTokens();
 
 ### Different TTLs for different password clients
 
-Laravel Passport allows to set one global TTL for access tokens, but it may be useful sometimes
+Laravel Passport allows to set one global TTL for tokens or refresh tokens or personal access tokens, but it may be useful sometimes
 to set different TTLs for different clients (eg. mobile users get more time than desktop users).
 
 Simply do the following in your service provider:
 
 ```php
 // Second parameter is the client Id
 LumenPassport::tokensExpireIn(Carbon::now()->addYears(50), 2); 
+LumenPassport::refreshTokensExpireIn(Carbon::now()->addMinutes(30), 4); 
+LumenPassport::personalAccessTokensExpireIn(Carbon::now()->addHours(1), 5); 
 ```
 
 If you don't specify client Id, it will simply fall back to Laravel Passport implementation.

src/LumenPassport.php

@@ -25,6 +25,20 @@ class LumenPassport
      */
     public static $tokensExpireAt = [];
 
+    /**
+     * The date when refresh tokens expire.
+     *
+     * @var \DateTimeInterface|null
+     */
+    public static $refreshTokensExpireAt;
+
+    /**
+     * The date when personal access tokens expire.
+     *
+     * @var \DateTimeInterface|null
+     */
+    public static $personalAccessTokensExpireAt;
+
     /**
      * Instruct Passport to keep revoked tokens pruned.
      */
@@ -56,10 +70,54 @@ public static function tokensExpireIn(DateTimeInterface $date = null, $clientId
             return isset(static::$tokensExpireAt[$clientId])
                 ? Carbon::now()->diff(static::$tokensExpireAt[$clientId])
                 : Passport::tokensExpireIn();
-        } else {
-            static::$tokensExpireAt[$clientId] = $date;
         }
 
+        static::$tokensExpireAt[$clientId] = $date;
+
+        return new static;
+    }
+
+    /**
+     * Get or set when refresh tokens expire.
+     *
+     * @param  \DateTimeInterface|null  $date
+     * @param int $clientId
+     * @return \DateInterval|static
+     */
+    public static function refreshTokensExpireIn(DateTimeInterface $date = null, $clientId = null)
+    {
+        if (! $clientId) return Passport::refreshTokensExpireIn($date);
+
+        if (is_null($date)) {
+            return isset(static::$refreshTokensExpireAt[$clientId])
+                ? Carbon::now()->diff(static::$refreshTokensExpireAt[$clientId])
+                : Passport::refreshTokensExpireIn();
+        }
+
+        static::$refreshTokensExpireAt[$clientId] = $date;
+
+        return new static;
+    }
+
+    /**
+     * Get or set when personal access tokens expire.
+     *
+     * @param  \DateTimeInterface|null  $date
+     * @param int $clientId
+     * @return \DateInterval|static
+     */
+    public static function personalAccessTokensExpireIn(DateTimeInterface $date = null, $clientId = null)
+    {
+        if (! $clientId) return Passport::personalAccessTokensExpireIn($date);
+
+        if (is_null($date)) {
+            return isset(static::$personalAccessTokensExpireAt[$clientId])
+                ? Carbon::now()->diff(static::$personalAccessTokensExpireAt[$clientId])
+                : Passport::personalAccessTokensExpireIn();
+        }
+
+        static::$personalAccessTokensExpireAt[$clientId] = $date;
+
         return new static;
     }
 

tests/LumenPassport/integration.php

@@ -30,4 +30,46 @@ public function token_ttl_can_be_set_via_lumen_class()
         $this->assertTrue(LumenPassport::tokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
         $this->assertTrue(Passport::tokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
     }
+
+    /**
+     * Test refresh token ttl can be set with lumen-passport class.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function refreshToken()
+    {
+        // Default (global) client
+        LumenPassport::refreshTokensExpireIn(Carbon::now()->addYears(1));
+        $this->assertTrue(Passport::refreshTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+        $this->assertTrue(LumenPassport::refreshTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+
+        // Specific client
+        LumenPassport::refreshTokensExpireIn(Carbon::now()->addYears(5), 2);
+        $this->assertTrue(LumenPassport::refreshTokensExpireIn(null, 2) == Carbon::now()->diff(Carbon::now()->addYears(5)));
+        $this->assertTrue(LumenPassport::refreshTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+        $this->assertTrue(Passport::refreshTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+    }
+
+    /**
+     * Test personal access tokens ttl can be set with lumen-passport class.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function personalAccessTokens()
+    {
+        // Default (global) client
+        LumenPassport::personalAccessTokensExpireIn(Carbon::now()->addYears(1));
+        $this->assertTrue(Passport::personalAccessTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+        $this->assertTrue(LumenPassport::personalAccessTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+
+        // Specific client
+        LumenPassport::personalAccessTokensExpireIn(Carbon::now()->addYears(5), 2);
+        $this->assertTrue(LumenPassport::personalAccessTokensExpireIn(null, 2) == Carbon::now()->diff(Carbon::now()->addYears(5)));
+        $this->assertTrue(LumenPassport::personalAccessTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+        $this->assertTrue(Passport::personalAccessTokensExpireIn() == Carbon::now()->diff(Carbon::now()->addYears(1)));
+    }
 }