Fixed refresh token when it expired

Author: ilyakharev

CHANGELOG.md

@@ -1,3 +1,4 @@
+* fixed refresh token when it expired
 * fixed retry at BAD_SESSION
 * added credentials authentication
 * added CI test

src/Discovery.php

@@ -30,6 +30,10 @@ class Discovery
      * @var LoggerInterface
      */
     protected $logger;
+    /**
+     * @var Iam
+     */
+    protected $credentials;
 
     /**
      * @param Ydb $ydb
@@ -43,6 +47,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->meta = $ydb->meta();
 
+        $this->credentials = $ydb->iam();
+
         $this->database = $ydb->database();
 
         $this->logger = $logger;
@@ -82,4 +88,4 @@ protected function request($method, array $data = [])
     {
         return $this->doRequest('Discovery', $method, $data);
     }
-}
+}

src/Operations.php

@@ -25,6 +25,10 @@ class Operations
      * @var LoggerInterface
      */
     protected $logger;
+    /**
+     * @var Iam
+     */
+    protected $credentials;
 
     /**
      * @param Ydb $ydb
@@ -38,6 +42,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->meta = $ydb->meta();
 
+        $this->credentials = $ydb->iam();
+
         $this->logger = $logger;
     }
 

src/Scheme.php

@@ -45,6 +45,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->meta = $ydb->meta();
 
+        $this->credentials = $ydb->iam();
+
         $this->database = $ydb->database();
 
         $this->logger = $logger;

src/Scripting.php

@@ -25,6 +25,10 @@ class Scripting
      * @var LoggerInterface
      */
     protected $logger;
+    /**
+     * @var Iam
+     */
+    protected $credentials;
 
     /**
      * @param Ydb $ydb
@@ -38,6 +42,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->meta = $ydb->meta();
 
+        $this->credentials = $ydb->iam();
+
         $this->logger = $logger;
     }
 

src/Session.php

@@ -82,6 +82,7 @@ public function __construct(Table $table, $session_id)
 
         $this->client = $table->client();
         $this->meta = $table->meta();
+        $this->credentials = $table->credentials();
         $this->path = $table->path();
         $this->logger = $table->getLogger();
 

src/Table.php

@@ -41,6 +41,10 @@ class Table
      * @var LoggerInterface
      */
     protected $logger;
+    /**
+     * @var Iam
+     */
+    protected $credentials;
 
     /**
      * @param Ydb $ydb
@@ -54,6 +58,8 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
 
         $this->meta = $ydb->meta();
 
+        $this->credentials = $ydb->iam();
+
         $this->path = $ydb->database();
 
         $this->logger = $logger;
@@ -284,6 +290,14 @@ public function createTable($table, $columns, $primary_key = 'id', $indexes = []
         return $this->session()->createTable($table, $columns, $primary_key, $indexes);
     }
 
+    /**
+     * @return Iam
+     */
+    public function credentials(): Iam
+    {
+        return $this->credentials;
+    }
+
     /**
      * Proxy to Session::copyTable.
      *
@@ -407,4 +421,4 @@ protected function streamRequest($method, array $data = [])
         return $this->doStreamRequest('Table', $method, $data);
     }
 
-}
+}

src/Traits/RequestTrait.php

@@ -41,6 +41,8 @@ trait RequestTrait
      */
     protected function doRequest($service, $method, array $data = [])
     {
+        $this->meta['x-ydb-auth-ticket'] = [$this->credentials->token()];
+
         $this->saveLastRequest($service, $method, $data);
 
         $requestClass = '\\Ydb\\' . $service . '\\' . $method . 'Request';

tests/RefreshTokenTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Auth;
+use YdbPlatform\Ydb\Auth\TokenInfo;
+use YdbPlatform\Ydb\Ydb;
+
+class TestCredentials extends Auth{
+
+    public function getTokenInfo(): TokenInfo
+    {
+        return new TokenInfo(time()+1,time()+1);
+    }
+
+    public function getName(): string
+    {
+        return "TestCredentials";
+    }
+}
+
+class MetaGetter extends \YdbPlatform\Ydb\Session{
+    public static function getMeta(\YdbPlatform\Ydb\Session $session){
+        return $session->meta;
+    }
+}
+
+class RefreshTokenTest extends TestCase
+{
+    public function test(){
+
+        $i = 0;
+
+        $config = [
+
+            // Database path
+            'database'    => '/local',
+
+            // Database endpoint
+            'endpoint'    => 'localhost:2136',
+
+            // Auto discovery (dedicated server only)
+            'discovery'   => false,
+
+            // IAM config
+            'iam_config'  => [
+                'insecure' => true,
+            ],
+            'credentials' => new TestCredentials()
+        ];
+        $ydb = new Ydb($config);
+        $table = $ydb->table();
+        $session = $table->session();
+        $token = MetaGetter::getMeta($session)["x-ydb-auth-ticket"];
+        usleep(1e6);
+        $session->query('select 1 as res');
+        self::assertNotEquals(
+            $token,
+            MetaGetter::getMeta($session)["x-ydb-auth-ticket"]
+        );
+    }
+}

tests/RetryOnBadSessionTest.php

@@ -44,7 +44,6 @@ public function test(){
         $session->delete();
         $session = $table->session();
         SessionManager::setSessionId($session,$oldSessionId);
-        print_r($session->query('select 1 as res'));
         self::assertEquals(
             1,
             $session->query('select 1 as res')->rows()[0]['res']