Skip to content

Commit

Permalink
More universal password reset form.
Browse files Browse the repository at this point in the history
  • Loading branch information
maddoger committed Oct 21, 2015
1 parent 73fcbdb commit de99dd4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion common/mail/passwordResetToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

/* @var $this yii\web\View */
/* @var $user maddoger\user\common\models\User */
/* @var $resetUrl array */

$resetLink = Yii::$app->urlManager->createAbsoluteUrl(['user/auth/reset-password', 'token' => $user->password_reset_token]);
$resetLink = Yii::$app->urlManager->createAbsoluteUrl($resetUrl);

echo Yii::t('maddoger/user', 'Hello {username}', ['username' => Html::encode($user->getName())]), ".\n\n",

Expand Down
7 changes: 6 additions & 1 deletion common/models/PasswordResetRequestForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ class PasswordResetRequestForm extends Model
public $code;
public $captchaAction;

public $resetUrl = ['user/auth/reset-password'];
public $mailView = 'passwordResetToken';

/**
* @inheritdoc
*/
Expand Down Expand Up @@ -73,7 +76,9 @@ public function sendEmail()
}

if ($user->save()) {
return Yii::$app->mailer->compose('@maddoger/user/common/mail/passwordResetToken', ['user' => $user])
$resetUrl = $this->resetUrl;
$resetUrl['token'] = $user->password_reset_token;
return Yii::$app->mailer->compose($this->mailView, ['user' => $user, 'resetUrl' => $resetUrl])
->setTo($this->email)
->setSubject(Yii::t('maddoger/user', 'Password reset for {app}', ['app' => \Yii::$app->name]))
->send();
Expand Down

0 comments on commit de99dd4

Please sign in to comment.