mirror of
https://github.com/elyby/accounts.git
synced 2024-11-09 23:12:20 +05:30
Добавлены экшены в контроллер и 1 тест (больше не успел)
This commit is contained in:
parent
50439fdaeb
commit
f99b281f30
@ -1,3 +1,6 @@
|
||||
<?php
|
||||
return [
|
||||
'/accounts/change-email/initialize' => 'accounts/change-email-initialize',
|
||||
'/accounts/change-email/submit-new-email' => 'accounts/change-email-submit-new-email',
|
||||
'/accounts/change-email/confirm-new-email' => 'accounts/change-email-confirm-new-email',
|
||||
];
|
||||
|
@ -1,6 +1,9 @@
|
||||
<?php
|
||||
namespace api\controllers;
|
||||
|
||||
use api\models\profile\ChangeEmail\ConfirmNewEmailForm;
|
||||
use api\models\profile\ChangeEmail\InitStateForm;
|
||||
use api\models\profile\ChangeEmail\NewEmailForm;
|
||||
use api\models\profile\ChangePasswordForm;
|
||||
use api\models\profile\ChangeUsernameForm;
|
||||
use common\models\Account;
|
||||
@ -21,7 +24,13 @@ class AccountsController extends Controller {
|
||||
'roles' => ['@'],
|
||||
],
|
||||
[
|
||||
'actions' => ['change-password', 'change-username'],
|
||||
'actions' => [
|
||||
'change-password',
|
||||
'change-username',
|
||||
'change-email-initialize',
|
||||
'change-email-submit-new-email',
|
||||
'change-email-confirm-new-email',
|
||||
],
|
||||
'allow' => true,
|
||||
'roles' => ['@'],
|
||||
'matchCallback' => function() {
|
||||
@ -40,6 +49,9 @@ class AccountsController extends Controller {
|
||||
'current' => ['GET'],
|
||||
'change-password' => ['POST'],
|
||||
'change-username' => ['POST'],
|
||||
'change-email-initialize' => ['POST'],
|
||||
'change-email-submit-new-email' => ['POST'],
|
||||
'change-email-confirm-new-email' => ['POST'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -92,4 +104,57 @@ class AccountsController extends Controller {
|
||||
];
|
||||
}
|
||||
|
||||
public function actionChangeEmailInitialize() {
|
||||
/** @var Account $account */
|
||||
$account = Yii::$app->user->identity;
|
||||
$model = new InitStateForm($account);
|
||||
if (!$model->sendCurrentEmailConfirmation()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'errors' => $this->normalizeModelErrors($model->getErrors()),
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
];
|
||||
}
|
||||
|
||||
public function actionChangeEmailSubmitNewEmail() {
|
||||
/** @var Account $account */
|
||||
$account = Yii::$app->user->identity;
|
||||
$model = new NewEmailForm($account);
|
||||
$model->load(Yii::$app->request->post());
|
||||
if (!$model->sendNewEmailConfirmation()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'errors' => $this->normalizeModelErrors($model->getErrors()),
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
];
|
||||
}
|
||||
|
||||
public function actionChangeEmailConfirmNewEmail() {
|
||||
/** @var Account $account */
|
||||
$account = Yii::$app->user->identity;
|
||||
$model = new ConfirmNewEmailForm($account);
|
||||
$model->load(Yii::$app->request->post());
|
||||
if (!$model->changeEmail()) {
|
||||
return [
|
||||
'success' => false,
|
||||
'errors' => $this->normalizeModelErrors($model->getErrors()),
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'data' => [
|
||||
'email' => $account->email,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ class InitStateForm extends ApiForm {
|
||||
public function rules() {
|
||||
// TODO: поверить наличие уже отправленных подтверждений смены E-mail
|
||||
return [
|
||||
['!email', 'validateAccountPasswordHashStrategy'],
|
||||
['!email', 'validateAccountPasswordHashStrategy', 'skipOnEmpty' => false],
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -30,4 +30,9 @@ class AccountsRoute extends BasePage {
|
||||
]);
|
||||
}
|
||||
|
||||
public function changeEmailInitialize() {
|
||||
$this->route = ['accounts/change-email-initialize'];
|
||||
$this->actor->sendPOST($this->getUrl());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
namespace tests\codeception\api;
|
||||
|
||||
use Codeception\Actor;
|
||||
use InvalidArgumentException;
|
||||
use tests\codeception\api\_pages\AuthenticationRoute;
|
||||
|
||||
/**
|
||||
@ -18,17 +20,23 @@ use tests\codeception\api\_pages\AuthenticationRoute;
|
||||
*
|
||||
* @SuppressWarnings(PHPMD)
|
||||
*/
|
||||
class FunctionalTester extends \Codeception\Actor {
|
||||
class FunctionalTester extends Actor {
|
||||
use _generated\FunctionalTesterActions;
|
||||
|
||||
public function loggedInAsActiveAccount() {
|
||||
$I = $this;
|
||||
$route = new AuthenticationRoute($I);
|
||||
$route->login('Admin', 'password_0');
|
||||
$I->canSeeResponseIsJson();
|
||||
$I->canSeeResponseJsonMatchesJsonPath('$.jwt');
|
||||
$jwt = $I->grabDataFromResponseByJsonPath('$.jwt')[0];
|
||||
$I->amBearerAuthenticated($jwt);
|
||||
public function loggedInAsActiveAccount($login = null, $password = null) {
|
||||
$route = new AuthenticationRoute($this);
|
||||
if ($login === null) {
|
||||
$route->login('Admin', 'password_0');
|
||||
} elseif ($login !== null && $password !== null) {
|
||||
$route->login($login, $password);
|
||||
} else {
|
||||
throw new InvalidArgumentException('login and password should be presented both.');
|
||||
}
|
||||
|
||||
$this->canSeeResponseIsJson();
|
||||
$this->canSeeResponseJsonMatchesJsonPath('$.jwt');
|
||||
$jwt = $this->grabDataFromResponseByJsonPath('$.jwt')[0];
|
||||
$this->amBearerAuthenticated($jwt);
|
||||
}
|
||||
|
||||
public function notLoggedIn() {
|
||||
|
@ -0,0 +1,46 @@
|
||||
<?php
|
||||
namespace tests\codeception\api\functional;
|
||||
|
||||
use Codeception\Specify;
|
||||
use tests\codeception\api\_pages\AccountsRoute;
|
||||
use tests\codeception\api\FunctionalTester;
|
||||
|
||||
class AccountsChangeEmailInitializeCest {
|
||||
|
||||
/**
|
||||
* @var AccountsRoute
|
||||
*/
|
||||
private $route;
|
||||
|
||||
public function _before(FunctionalTester $I) {
|
||||
$this->route = new AccountsRoute($I);
|
||||
}
|
||||
|
||||
public function testChangeEmailInitialize(FunctionalTester $I) {
|
||||
$I->wantTo('send current email confirmation');
|
||||
$I->loggedInAsActiveAccount();
|
||||
|
||||
$this->route->changeEmailInitialize();
|
||||
$I->canSeeResponseCodeIs(200);
|
||||
$I->canSeeResponseIsJson();
|
||||
$I->canSeeResponseContainsJson([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
public function testChangeEmailWithOldPasswordStrategy(FunctionalTester $I) {
|
||||
$I->wantTo('see, that account use old account password hash strategy');
|
||||
$I->loggedInAsActiveAccount('AccWithOldPassword', '12345678');
|
||||
|
||||
$this->route->changeEmailInitialize();
|
||||
$I->canSeeResponseCodeIs(200);
|
||||
$I->canSeeResponseIsJson();
|
||||
$I->canSeeResponseContainsJson([
|
||||
'success' => false,
|
||||
'errors' => [
|
||||
'email' => 'error.old_hash_strategy',
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user