Add tests for the legacy tokens

common/tests/_support/FixtureHelper.php

@@ -52,7 +52,11 @@ class FixtureHelper extends Module {
             'usernamesHistory' => fixtures\UsernameHistoryFixture::class,
             'oauthClients' => fixtures\OauthClientFixture::class,
             'oauthSessions' => fixtures\OauthSessionFixture::class,
+            'legacyOauthSessionsScopes' => fixtures\LegacyOauthSessionScopeFixtures::class,
+            'legacyOauthAccessTokens' => fixtures\LegacyOauthAccessTokenFixture::class,
+            'legacyOauthAccessTokensScopes' => fixtures\LegacyOauthAccessTokenScopeFixture::class,
             'oauthRefreshTokens' => fixtures\OauthRefreshTokensFixture::class,
+            'legacyOauthRefreshTokens' => fixtures\LegacyOauthRefreshTokenFixture::class,
             'minecraftAccessKeys' => fixtures\MinecraftAccessKeyFixture::class,
         ];
     }

common/tests/_support/Redis/Fixture.php

@@ -0,0 +1,82 @@
+<?php
+declare(strict_types=1);
+
+namespace common\tests\_support\Redis;
+
+use InvalidArgumentException;
+use yii\base\ArrayAccessTrait;
+use yii\di\Instance;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Json;
+use yii\redis\Connection;
+use yii\test\FileFixtureTrait;
+use yii\test\Fixture as BaseFixture;
+
+class Fixture extends BaseFixture {
+    use ArrayAccessTrait;
+    use FileFixtureTrait;
+
+    /**
+     * @var Connection
+     */
+    public $redis = 'redis';
+
+    public $keysPrefix = '';
+
+    public $keysPostfix = '';
+
+    public $data = [];
+
+    public function init() {
+        parent::init();
+        $this->redis = Instance::ensure($this->redis, Connection::class);
+    }
+
+    public function load() {
+        $this->data = [];
+        foreach ($this->getData() as $key => $data) {
+            $key = $this->buildKey($key);
+            $preparedData = $this->prepareData($data);
+            if (is_array($preparedData)) {
+                $this->redis->sadd($key, ...$preparedData);
+            } else {
+                $this->redis->set($key, $preparedData);
+            }
+
+            $this->data[$key] = $data;
+        }
+    }
+
+    public function unload() {
+        $this->redis->flushdb();
+    }
+
+    protected function getData(): array {
+        return $this->loadData($this->dataFile);
+    }
+
+    protected function prepareData($input) {
+        if (is_string($input)) {
+            return $input;
+        }
+
+        if (is_int($input) || is_bool($input)) {
+            return (string)$input;
+        }
+
+        if (is_array($input)) {
+            if (!ArrayHelper::isAssociative($input)) {
+                return $input;
+            }
+
+            return Json::encode($input);
+        }
+
+        throw new InvalidArgumentException('Unsupported input type');
+    }
+
+    protected function buildKey($key): string {
+        return $this->keysPrefix . $key . $this->keysPostfix;
+    }
+
+}

common/tests/fixtures/LegacyOauthAccessTokenFixture.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace common\tests\fixtures;
+
+use common\tests\_support\Redis\Fixture;
+
+class LegacyOauthAccessTokenFixture extends Fixture {
+
+    public $dataFile = '@root/common/tests/fixtures/data/legacy-oauth-access-tokens.php';
+
+    public $keysPrefix = 'oauth:access:tokens:';
+
+}

common/tests/fixtures/LegacyOauthAccessTokenScopeFixture.php

@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace common\tests\fixtures;
+
+use common\tests\_support\Redis\Fixture;
+
+class LegacyOauthAccessTokenScopeFixture extends Fixture {
+
+    public $dataFile = '@root/common/tests/fixtures/data/legacy-oauth-access-tokens-scopes.php';
+
+    public $keysPrefix = 'oauth:access:tokens:';
+
+    public $keysPostfix = ':scopes';
+
+}

common/tests/fixtures/LegacyOauthRefreshTokenFixture.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace common\tests\fixtures;
+
+use common\tests\_support\Redis\Fixture;
+
+class LegacyOauthRefreshTokenFixture extends Fixture {
+
+    public $dataFile = '@root/common/tests/fixtures/data/legacy-oauth-refresh-tokens.php';
+
+    public $keysPrefix = 'oauth:refresh:tokens:';
+
+}

common/tests/fixtures/LegacyOauthSessionScopeFixtures.php

@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+namespace common\tests\fixtures;
+
+use common\tests\_support\Redis\Fixture;
+
+class LegacyOauthSessionScopeFixtures extends Fixture {
+
+    public $dataFile = '@root/common/tests/fixtures/data/legacy-oauth-sessions-scopes.php';
+
+    public $keysPrefix = 'oauth:sessions:';
+
+    public $keysPostfix = ':scopes';
+
+}

common/tests/fixtures/data/legacy-oauth-access-tokens-scopes.php

@@ -0,0 +1,4 @@
+<?php
+return [
+    'ZZQP8sS9urzriy8N9h6FwFNMOH3PkZ5T5PLqS6SX' => ['minecraft_server_session', 'obtain_own_account_info'],
+];

common/tests/fixtures/data/legacy-oauth-access-tokens.php

@@ -0,0 +1,16 @@
+<?php
+
+use Carbon\Carbon;
+
+return [
+    'ZZQP8sS9urzriy8N9h6FwFNMOH3PkZ5T5PLqS6SX' => [
+        'id' => 'ZZQP8sS9urzriy8N9h6FwFNMOH3PkZ5T5PLqS6SX',
+        'session_id' => 1,
+        'expire_time' => Carbon::now()->addHour()->getTimestamp(),
+    ],
+    'rc0sOF1SLdOxuD3bJcCQENmGTeYrGgy12qJScMx4' => [
+        'id' => 'rc0sOF1SLdOxuD3bJcCQENmGTeYrGgy12qJScMx4',
+        'session_id' => 1,
+        'expire_time' => Carbon::now()->subHour()->getTimestamp(),
+    ],
+];

common/tests/fixtures/data/legacy-oauth-refresh-tokens.php

@@ -0,0 +1,8 @@
+<?php
+return [
+    'op7kPGAgHlsXRBJtkFg7wKOTpodvtHVW5NxR7Tjr' => [
+        'id' => 'op7kPGAgHlsXRBJtkFg7wKOTpodvtHVW5NxR7Tjr',
+        'access_token_id' => 'cynbpR53GK5HyvHuTtriHP7JpdqvFaYnWSS1twXX',
+        'session_id' => 1,
+    ],
+];

common/tests/fixtures/data/legacy-oauth-sessions-scopes.php

@@ -0,0 +1,4 @@
+<?php
+return [
+    1 => ['minecraft_server_session', 'obtain_own_account_info'],
+];

common/tests/fixtures/data/oauth-sessions.php

@@ -3,24 +3,28 @@ return [
     'admin-test1' => [
         'account_id' => 1,
         'client_id' => 'test1',
+        'legacy_id' => 1,
         'scopes' => null,
         'created_at' => 1479944472,
     ],
     'banned-account-session' => [
         'account_id' => 10,
         'client_id' => 'test1',
+        'legacy_id' => 2,
         'scopes' => null,
         'created_at' => 1481421663,
     ],
     'deleted-client-session' => [
         'account_id' => 1,
         'client_id' => 'deleted-oauth-client-with-sessions',
+        'legacy_id' => 3,
         'scopes' => null,
         'created_at' => 1519510065,
     ],
     'actual-deleted-client-session' => [
         'account_id' => 2,
         'client_id' => 'deleted-oauth-client-with-sessions',
+        'legacy_id' => 4,
         'scopes' => null,
         'created_at' => 1519511568,
     ],