Реорганизована выдача JWT токенов

Добавлен механизм сохранения сессий и refresh_token

tests/codeception/api/unit/models/authentication/ConfirmEmailFormTest.php

@@ -1,9 +1,11 @@
 <?php
 namespace tests\codeception\api\models\authentication;
 
+use api\components\User\LoginResult;
 use api\models\authentication\ConfirmEmailForm;
 use Codeception\Specify;
 use common\models\Account;
+use common\models\AccountSession;
 use common\models\EmailActivation;
 use tests\codeception\api\unit\DbTestCase;
 use tests\codeception\common\fixtures\EmailActivationFixture;
@@ -31,7 +33,9 @@ class ConfirmEmailFormTest extends DbTestCase {
         $fixture = $this->emailActivations['freshRegistrationConfirmation'];
         $model = $this->createModel($fixture['key']);
         $this->specify('expect true result', function() use ($model, $fixture) {
-            expect('model return successful result', $model->confirm())->notEquals(false);
+            $result = $model->confirm();
+            expect($result)->isInstanceOf(LoginResult::class);
+            expect('session was generated', $result->getSession())->isInstanceOf(AccountSession::class);
             $activationExists = EmailActivation::find()->andWhere(['key' => $fixture['key']])->exists();
             expect('email activation key is not exist', $activationExists)->false();
             /** @var Account $user */

tests/codeception/api/unit/models/authentication/LoginFormTest.php

@@ -1,6 +1,8 @@
 <?php
 namespace tests\codeception\api\models\authentication;
 
+use api\components\User\LoginResult;
+use api\models\AccountIdentity;
 use api\models\authentication\LoginForm;
 use Codeception\Specify;
 use common\models\Account;
@@ -14,12 +16,22 @@ use Yii;
 class LoginFormTest extends DbTestCase {
     use Specify;
 
+    private $originalRemoteAddr;
+
+    public function setUp() {
+        $this->originalRemoteAddr = $_SERVER['REMOTE_ADDR'] ?? null;
+        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+        parent::setUp();
+    }
+
+    public function tearDown() {
+        parent::tearDown();
+        $_SERVER['REMOTE_ADDR'] = $this->originalRemoteAddr;
+    }
+
     public function fixtures() {
         return [
-            'accounts' => [
-                'class' => AccountFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/accounts.php',
-            ],
+            'accounts' => AccountFixture::class,
         ];
     }
 
@@ -36,7 +48,7 @@ class LoginFormTest extends DbTestCase {
         $this->specify('no errors if login exists', function () {
             $model = $this->createModel([
                 'login' => 'mr-test',
-                'account' => new Account(),
+                'account' => new AccountIdentity(),
             ]);
             $model->validateLogin('login');
             expect($model->getErrors('login'))->isEmpty();
@@ -47,7 +59,7 @@ class LoginFormTest extends DbTestCase {
         $this->specify('error.password_incorrect if password invalid', function () {
             $model = $this->createModel([
                 'password' => '87654321',
-                'account' => new Account(['password' => '12345678']),
+                'account' => new AccountIdentity(['password' => '12345678']),
             ]);
             $model->validatePassword('password');
             expect($model->getErrors('password'))->equals(['error.password_incorrect']);
@@ -56,7 +68,7 @@ class LoginFormTest extends DbTestCase {
         $this->specify('no errors if password valid', function () {
             $model = $this->createModel([
                 'password' => '12345678',
-                'account' => new Account(['password' => '12345678']),
+                'account' => new AccountIdentity(['password' => '12345678']),
             ]);
             $model->validatePassword('password');
             expect($model->getErrors('password'))->isEmpty();
@@ -66,7 +78,7 @@ class LoginFormTest extends DbTestCase {
     public function testValidateActivity() {
         $this->specify('error.account_not_activated if account in not activated state', function () {
             $model = $this->createModel([
-                'account' => new Account(['status' => Account::STATUS_REGISTERED]),
+                'account' => new AccountIdentity(['status' => Account::STATUS_REGISTERED]),
             ]);
             $model->validateActivity('login');
             expect($model->getErrors('login'))->equals(['error.account_not_activated']);
@@ -74,7 +86,7 @@ class LoginFormTest extends DbTestCase {
 
         $this->specify('no errors if account active', function () {
             $model = $this->createModel([
-                'account' => new Account(['status' => Account::STATUS_ACTIVE]),
+                'account' => new AccountIdentity(['status' => Account::STATUS_ACTIVE]),
             ]);
             $model->validateActivity('login');
             expect($model->getErrors('login'))->isEmpty();
@@ -86,13 +98,13 @@ class LoginFormTest extends DbTestCase {
             $model = $this->createModel([
                 'login' => 'erickskrauch',
                 'password' => '12345678',
-                'account' => new Account([
+                'account' => new AccountIdentity([
                     'username' => 'erickskrauch',
                     'password' => '12345678',
                     'status' => Account::STATUS_ACTIVE,
                 ]),
             ]);
-            expect('model should login user', $model->login())->notEquals(false);
+            expect('model should login user', $model->login())->isInstanceOf(LoginResult::class);
             expect('error message should not be set', $model->errors)->isEmpty();
         });
     }
@@ -103,7 +115,7 @@ class LoginFormTest extends DbTestCase {
                 'login' => $this->accounts['user-with-old-password-type']['username'],
                 'password' => '12345678',
             ]);
-            expect($model->login())->notEquals(false);
+            expect($model->login())->isInstanceOf(LoginResult::class);
             expect($model->errors)->isEmpty();
             expect($model->getAccount()->password_hash_strategy)->equals(Account::PASS_HASH_STRATEGY_YII2);
         });

tests/codeception/api/unit/models/authentication/RecoverPasswordFormTest.php

@@ -1,6 +1,7 @@
 <?php
 namespace tests\codeception\api\models\authentication;
 
+use api\components\User\LoginResult;
 use api\models\authentication\RecoverPasswordForm;
 use Codeception\Specify;
 use common\models\Account;
@@ -29,7 +30,9 @@ class RecoverPasswordFormTest extends DbTestCase {
                 'newPassword' => '12345678',
                 'newRePassword' => '12345678',
             ]);
-            expect($model->recoverPassword())->notEquals(false);
+            $result = $model->recoverPassword();
+            expect($result)->isInstanceOf(LoginResult::class);
+            expect('session was not generated', $result->getSession())->null();
             $activationExists = EmailActivation::find()->andWhere(['key' => $fixture['key']])->exists();
             expect($activationExists)->false();
             /** @var Account $account */