ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2024-12-28 16:10:40 +05:30
Code Issues Packages Projects Releases Wiki Activity

Исправлен баг с ссылками в email с активацией

Browse Source
This commit is contained in:
ErickSkrauch 2017-06-11 21:06:55 +03:00
parent 861c6810cb
commit 013d0eda60
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/emails/templates/ForgotPasswordParams.php
View File

@ -12,7 +12,7 @@ class ForgotPasswordParams {
public function __construct(string $username, string $code, string $link) { public function __construct(string $username, string $code, string $link) {
$this->username = $username; $this->username = $username;
$this->code = $code; $this->code = $code;
$this->link = $code; $this->link = $link;
} }
public function getUsername(): string { public function getUsername(): string {

2
common/emails/templates/RegistrationEmailParams.php
View File

@ -12,7 +12,7 @@ class RegistrationEmailParams {
public function __construct(string $username, string $code, string $link) { public function __construct(string $username, string $code, string $link) {
$this->username = $username; $this->username = $username;
$this->code = $code; $this->code = $code;
$this->link = $code; $this->link = $link;
} }
public function getUsername(): string { public function getUsername(): string {

8
tests/codeception/api/unit/models/authentication/ForgotPasswordFormTest.php
View File

@ -96,8 +96,14 @@ class ForgotPasswordFormTest extends TestCase {
public function testForgotPassword() { public function testForgotPassword() {
$model = new ForgotPasswordForm(['login' => $this->tester->grabFixture('accounts', 'admin')['username']]); $model = new ForgotPasswordForm(['login' => $this->tester->grabFixture('accounts', 'admin')['username']]);
$this->assertTrue($model->forgotPassword(), 'form should be successfully processed'); $this->assertTrue($model->forgotPassword(), 'form should be successfully processed');
$this->assertInstanceOf(EmailActivation::class, $model->getEmailActivation(), 'getEmailActivation should return valid object instance'); $activation = $model->getEmailActivation();
$this->assertInstanceOf(EmailActivation::class, $activation, 'getEmailActivation should return valid object instance');
$this->tester->canSeeEmailIsSent(1); $this->tester->canSeeEmailIsSent(1);
/** @var \yii\swiftmailer\Message $email */
$email = $this->tester->grabSentEmails()[0];
$body = $email->getSwiftMessage()->getBody();
$this->assertContains($activation->key, $body);
$this->assertContains('/recover-password/' . $activation->key, $body);
} }
public function testForgotPasswordResend() { public function testForgotPasswordResend() {

13
tests/codeception/api/unit/models/authentication/RegistrationFormTest.php
View File

@ -97,16 +97,25 @@ class RegistrationFormTest extends TestCase {
'username' => 'some_username', 'username' => 'some_username',
'email' => 'some_email@example.com', 'email' => 'some_email@example.com',
])->exists(), 'user model exists in database'); ])->exists(), 'user model exists in database');
$this->assertTrue(EmailActivation::find()->andWhere([ /** @var EmailActivation $activation */
$activation = EmailActivation::find()
->andWhere([
'account_id' => $account->id, 'account_id' => $account->id,
'type' => EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION, 'type' => EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION,
])->exists(), 'email activation code exists in database'); ])
->one();
$this->assertInstanceOf(EmailActivation::class, $activation, 'email activation code exists in database');
$this->assertTrue(UsernameHistory::find()->andWhere([ $this->assertTrue(UsernameHistory::find()->andWhere([
'username' => $account->username, 'username' => $account->username,
'account_id' => $account->id, 'account_id' => $account->id,
'applied_in' => $account->created_at, 'applied_in' => $account->created_at,
])->exists(), 'username history record exists in database'); ])->exists(), 'username history record exists in database');
$this->tester->canSeeEmailIsSent(1); $this->tester->canSeeEmailIsSent(1);
/** @var \yii\swiftmailer\Message $email */
$email = $this->tester->grabSentEmails()[0];
$body = $email->getSwiftMessage()->getBody();
$this->assertContains($activation->key, $body);
$this->assertContains('/activation/' . $activation->key, $body);
} }
private function mockRequest($ip = '88.225.20.236') { private function mockRequest($ip = '88.225.20.236') {