added an refresh token before it expire

Author: ilyakharev

src/Auth/TokenInfo.php

@@ -13,10 +13,13 @@ class TokenInfo
      */
     protected $expiresAt;
 
+    private $refreshAt;
+
     public function __construct(string $token, int $expiresAt)
     {
         $this->token = $token;
         $this->expiresAt = $expiresAt;
+        $this->refreshAt = time() + 0.1*($this->expiresAt-time());
     }
 
     /**
@@ -34,4 +37,9 @@ public function getToken(): string
     {
         return $this->token;
     }
+
+    public function getRefreshAt(): int
+    {
+        return $this->refreshAt;
+    }
 }

src/Iam.php

@@ -45,6 +45,11 @@ class Iam implements IamTokenContract
      */
     protected $logger;
 
+    /**
+     * @var int
+     */
+    protected $refresh_at;
+
     /**
      * @param array $config
      * @param LoggerInterface|null $logger
@@ -96,9 +101,11 @@ public function newToken()
         $tokenInfo = $this->config('credentials')->getTokenInfo();
         $this->iam_token = $tokenInfo->getToken();
         $this->expires_at = $tokenInfo->getExpiresAt();
+        $this->refresh_at = $tokenInfo->getRefreshAt();
         $this->saveToken((object)[
             "iamToken" => $tokenInfo->getToken(),
             "expiresAt" => $tokenInfo->getExpiresAt(),
+            "refreshAt" => $tokenInfo->getRefreshAt()
         ]);
         return $tokenInfo->getToken();
     }
@@ -347,7 +354,14 @@ protected function loadToken()
     {
         if ($this->iam_token)
         {
-            if ($this->expires_at > time())
+            if ($this->refresh_at < time()){
+                try {
+                    return $this->newToken();
+                } catch (\Exception $e){
+                    return $this->iam_token;
+                }
+            }
+            else if ($this->expires_at > time())
             {
                 return $this->iam_token;
             }
@@ -372,6 +386,7 @@ protected function loadTokenFromFile()
             {
                 $this->iam_token = $token->iamToken;
                 $this->expires_at = $token->expiresAt;
+                $this->refresh_at = $token->refreshAt ?? $token->expiresAt;
                 $this->logger()->info('YDB: Reused IAM token [...' . substr($this->iam_token, -6) . '].');
                 return $token->iamToken;
             }
@@ -390,10 +405,12 @@ protected function saveToken($token)
 
         $this->iam_token = $token->iamToken;
         $this->expires_at = $this->convertExpiresAt($token->expiresAt ?? '');
+        $this->refresh_at = $token->refreshAt;
 
         file_put_contents($tokenFile, json_encode([
             'iamToken' => $this->iam_token,
             'expiresAt' => $this->expires_at,
+            'refreshAt' => $this->refresh_at
         ]));
     }
 

tests/RefreshTokenTest.php

@@ -7,16 +7,30 @@
 use YdbPlatform\Ydb\Auth\TokenInfo;
 use YdbPlatform\Ydb\Ydb;
 
-class TestCredentials extends Auth{
+class FakeCredentials extends Auth {
+
+    /**
+     * @var int
+     */
+    protected $counter;
+
+    public function __construct(&$counter)
+    {
+        $this->counter = &$counter;
+    }
 
     public function getTokenInfo(): TokenInfo
     {
-        return new TokenInfo(time()+1,time()+1);
+        $this->counter++;
+        if ($this->counter==2){
+            throw new \Exception("Some error");
+        }
+        return new TokenInfo(time()+3,time()+3);
     }
 
     public function getName(): string
     {
-        return "TestCredentials";
+        return "FakeCredentials";
     }
 }
 
@@ -30,7 +44,7 @@ class RefreshTokenTest extends TestCase
 {
     public function test(){
 
-        $i = 0;
+        $counter = 0;
 
         $config = [
 
@@ -47,17 +61,45 @@ public function test(){
             'iam_config'  => [
                 'insecure' => true,
             ],
-            'credentials' => new TestCredentials()
+            'credentials' => new FakeCredentials($counter)
         ];
         $ydb = new Ydb($config);
         $table = $ydb->table();
         $session = $table->session();
-        $token = MetaGetter::getMeta($session)["x-ydb-auth-ticket"];
+        $token = MetaGetter::getMeta($session)["x-ydb-auth-ticket"][0];
+        self::assertEquals(
+            1,
+            $counter
+        );
+
+        $session->query('select 1 as res');
+        self::assertEquals(
+            $token,
+            MetaGetter::getMeta($session)["x-ydb-auth-ticket"][0]
+        );
+        self::assertEquals(
+            1,
+            $counter
+        );
+
         usleep(1e6);
         $session->query('select 1 as res');
+        self::assertEquals(
+            2,
+            $counter
+        );
+        self::assertEquals(
+            $token,
+            MetaGetter::getMeta($session)["x-ydb-auth-ticket"][0]
+        );
+        $session->query('select 1 as res');
+        self::assertEquals(
+            3,
+            $counter
+        );
         self::assertNotEquals(
             $token,
-            MetaGetter::getMeta($session)["x-ydb-auth-ticket"]
+            MetaGetter::getMeta($session)["x-ydb-auth-ticket"][0]
         );
     }
 }