Реализована логика oAuth авторизации приложений, добавлен Redis, удалены лишние тесты, пофикшены старые.

tests/codeception/api/functional/ContactCept.php

@@ -1,47 +0,0 @@
-<?php
-use tests\codeception\api\FunctionalTester;
-use tests\codeception\api\_pages\ContactPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new FunctionalTester($scenario);
-$I->wantTo('ensure that contact works');
-
-$contactPage = ContactPage::openBy($I);
-
-$I->see('Contact', 'h1');
-
-$I->amGoingTo('submit contact form with no data');
-$contactPage->submit([]);
-$I->expectTo('see validations errors');
-$I->see('Contact', 'h1');
-$I->see('Name cannot be blank', '.help-block');
-$I->see('Email cannot be blank', '.help-block');
-$I->see('Subject cannot be blank', '.help-block');
-$I->see('Body cannot be blank', '.help-block');
-$I->see('The verification code is incorrect', '.help-block');
-
-$I->amGoingTo('submit contact form with not correct email');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester.email',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-$I->expectTo('see that email adress is wrong');
-$I->dontSee('Name cannot be blank', '.help-block');
-$I->see('Email is not a valid email address.', '.help-block');
-$I->dontSee('Subject cannot be blank', '.help-block');
-$I->dontSee('Body cannot be blank', '.help-block');
-$I->dontSee('The verification code is incorrect', '.help-block');
-
-$I->amGoingTo('submit contact form with correct data');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester@example.com',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-$I->see('Thank you for contacting us. We will respond to you as soon as possible.');

tests/codeception/api/functional/OauthCest.php

@@ -0,0 +1,294 @@
+<?php
+namespace tests\codeception\api;
+
+use tests\codeception\api\_pages\OauthRoute;
+use tests\codeception\api\functional\_steps\AccountSteps;
+
+class OauthCest {
+
+    /**
+     * @var OauthRoute
+     */
+    private $route;
+
+    public function _before(FunctionalTester $I) {
+        $this->route = new OauthRoute($I);
+    }
+
+    public function testValidateRequest(FunctionalTester $I) {
+        $this->testOauthParamsValidation($I, 'validate');
+
+        $I->wantTo('validate and obtain information about new auth request');
+        $this->route->validate($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            [
+                'minecraft_server_session'
+            ],
+            'test-state'
+        ));
+        $I->canSeeResponseCodeIs(200);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'success' => true,
+            'oAuth' => [
+                'client_id' => 'ely',
+                'redirect_uri' => 'http://ely.by',
+                'response_type' => 'code',
+                'scope' => 'minecraft_server_session',
+                'state' => 'test-state',
+            ],
+            'client' => [
+                'id' => 'ely',
+                'name' => 'Ely.by',
+                'description' => 'Всем знакомое елуби',
+            ],
+            'session' => [
+                'scopes' => [
+                    'minecraft_server_session',
+                ],
+            ],
+        ]);
+    }
+
+    public function testValidateWithDescriptionReplaceRequest(FunctionalTester $I) {
+        $I->wantTo('validate and get information with description replacement');
+        $this->route->validate($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            null,
+            null,
+            [
+                'description' => 'all familiar eliby',
+            ]
+        ));
+        $I->canSeeResponseCodeIs(200);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'client' => [
+                'description' => 'all familiar eliby',
+            ],
+        ]);
+    }
+
+    public function testCompleteValidationAction($I, $scenario) {
+        $I = new AccountSteps($scenario);
+        $I->loggedInAsActiveAccount();
+        $I->wantTo('validate all oAuth params on complete request');
+        $this->testOauthParamsValidation($I, 'complete');
+    }
+
+    public function testCompleteActionOnWrongConditions($I, $scenario) {
+        $I = new AccountSteps($scenario);
+        $I->loggedInAsActiveAccount();
+
+        $I->wantTo('get accept_required if I dom\'t require any scope, but this is first time request');
+        $I->cleanupRedis();
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code'
+        ));
+        $I->canSeeResponseCodeIs(401);
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'accept_required',
+            'parameter' => '',
+            'statusCode' => 401,
+        ]);
+
+        $I->wantTo('get accept_required if I require some scopes on first time');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session']
+        ));
+        $I->canSeeResponseCodeIs(401);
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'accept_required',
+            'parameter' => '',
+            'statusCode' => 401,
+        ]);
+    }
+
+    public function testCompleteActionSuccess($I, $scenario) {
+        $I = new AccountSteps($scenario);
+        $I->loggedInAsActiveAccount();
+
+        $I->wantTo('get auth code if I require some scope and pass accept field');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session']
+        ), ['accept' => true]);
+        $I->canSeeResponseCodeIs(200);
+        $I->canSeeResponseContainsJson([
+            'success' => true,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+
+        $I->wantTo('get auth code if I don\'t require any scope and don\'t pass accept field, but previously have ' .
+                   'successful request');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code'
+        ));
+        $I->canSeeResponseCodeIs(200);
+        $I->canSeeResponseContainsJson([
+            'success' => true,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+
+        $I->wantTo('get auth code if I require some scopes and don\'t pass accept field, but previously have successful ' .
+                   'request with same scopes');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session']
+        ));
+        $I->canSeeResponseCodeIs(200);
+        $I->canSeeResponseContainsJson([
+            'success' => true,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+    }
+
+    public function testAcceptRequiredOnNewScope($I, $scenario) {
+        $I = new AccountSteps($scenario);
+        $I->loggedInAsActiveAccount();
+        $I->wantTo('get accept_required if I have previous successful request, but now require some new scope');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session']
+        ), ['accept' => true]);
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session', 'change_skin']
+        ));
+        $I->canSeeResponseCodeIs(401);
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'accept_required',
+            'parameter' => '',
+            'statusCode' => 401,
+        ]);
+    }
+
+    public function testCompleteActionWithDismissState($I, $scenario) {
+        $I = new AccountSteps($scenario);
+        $I->loggedInAsActiveAccount();
+        $I->wantTo('get access_denied error if I pass accept in false state');
+        $this->route->complete($this->buildQueryParams(
+            'ely',
+            'http://ely.by',
+            'code',
+            ['minecraft_server_session']
+        ), ['accept' => false]);
+        $I->canSeeResponseCodeIs(401);
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'access_denied',
+            'parameter' => '',
+            'statusCode' => 401,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+    }
+
+    private function buildQueryParams(
+        $clientId = null,
+        $redirectUri = null,
+        $responseType = null,
+        $scopes = [],
+        $state = null,
+        $customData = []
+    ) {
+        $params = $customData;
+        if ($clientId !== null) {
+            $params['client_id'] = $clientId;
+        }
+
+        if ($redirectUri !== null) {
+            $params['redirect_uri'] = $redirectUri;
+        }
+
+        if ($responseType !== null) {
+            $params['response_type'] = $responseType;
+        }
+
+        if ($state !== null) {
+            $params['state'] = $state;
+        }
+
+        if (!empty($scopes)) {
+            if (is_array($scopes)) {
+                $scopes = implode(',', $scopes);
+            }
+
+            $params['scope'] = $scopes;
+        }
+
+        return $params;
+    }
+
+    private function testOauthParamsValidation(FunctionalTester $I, $action) {
+        $I->wantTo('check behavior on invalid request without one or few params');
+        $this->route->$action($this->buildQueryParams());
+        $I->canSeeResponseCodeIs(400);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'invalid_request',
+            'parameter' => 'client_id',
+            'statusCode' => 400,
+        ]);
+
+        $I->wantTo('check behavior on invalid client id');
+        $this->route->$action($this->buildQueryParams('non-exists-client', 'http://some-resource.by', 'code'));
+        $I->canSeeResponseCodeIs(401);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'invalid_client',
+            'statusCode' => 401,
+        ]);
+
+        $I->wantTo('check behavior on invalid response type');
+        $this->route->$action($this->buildQueryParams('ely', 'http://ely.by', 'kitty'));
+        $I->canSeeResponseCodeIs(400);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'unsupported_response_type',
+            'parameter' => 'kitty',
+            'statusCode' => 400,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+
+        $I->wantTo('check behavior on some invalid scopes');
+        $this->route->$action($this->buildQueryParams('ely', 'http://ely.by', 'code', [
+            'minecraft_server_session',
+            'some_wrong_scope',
+        ]));
+        $I->canSeeResponseCodeIs(400);
+        $I->canSeeResponseIsJson();
+        $I->canSeeResponseContainsJson([
+            'success' => false,
+            'error' => 'invalid_scope',
+            'parameter' => 'some_wrong_scope',
+            'statusCode' => 400,
+        ]);
+        $I->canSeeResponseJsonMatchesJsonPath('$.redirectUri');
+    }
+
+}

tests/codeception/api/functional/_bootstrap.php

@@ -1,3 +1,5 @@
 <?php
 
 new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/api/functional.php'));
+
+\Codeception\Util\Autoload::registerSuffix('Steps', __DIR__ . DIRECTORY_SEPARATOR);

tests/codeception/api/functional/_steps/AccountSteps.php

@@ -0,0 +1,16 @@
+<?php
+namespace tests\codeception\api\functional\_steps;
+
+use tests\codeception\api\_pages\LoginRoute;
+use tests\codeception\api\FunctionalTester;
+
+class AccountSteps extends FunctionalTester {
+
+    public function loggedInAsActiveAccount() {
+        $I = $this;
+        $route = new LoginRoute($I);
+        $route->login('Admin', 'password_0');
+        $I->canSeeResponseIsJson();
+    }
+
+}