Merge branch 'refactor-recovery-controller' of https://github.com/thy…

…seus/yii2-user into refactor-recovery-controller
dektrium · Apr 11, 2017 · f07cab6 · f07cab6
2 parents 40df53d + 2ee6122
commit f07cab6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/controllers/RecoveryController.php b/controllers/RecoveryController.php
@@ -120,7 +120,7 @@ public function actionRequest()
 
         if ($model->load(\Yii::$app->request->post()) && $model->sendRecoveryMessage()) {
             $this->trigger(self::EVENT_AFTER_REQUEST, $event);
-            return $this->render('/recovery/request_sent');
+            return $this->render('request_sent');
         }
 
         return $this->render('request', [
@@ -150,15 +150,12 @@ public function actionReset($id, $code)
         $this->trigger(self::EVENT_BEFORE_TOKEN_VALIDATE, $event);
 
         if ($token === null || $token->isExpired || $token->user === null) {
-            $this->trigger(self::EVENT_AFTER_TOKEN_VALIDATE, $event);
-            \Yii::$app->session->setFlash(
-                'danger',
-                \Yii::t('user', 'Recovery link is invalid or expired. Please try requesting a new one.')
-            );
-            return $this->render('/message', [
-                'title'  => \Yii::t('user', 'Invalid or expired link'),
-                'module' => $this->module,
-            ]);
+          $this->trigger(self::EVENT_AFTER_TOKEN_VALIDATE, $event);
+          \Yii::$app->session->setFlash(
+            'danger',
+            \Yii::t('user', 'Recovery link is invalid or expired. Please try requesting a new one.')
+          );
+          return $this->render('link_invalid');
         }
 
         /** @var RecoveryForm $model */
@@ -173,10 +170,7 @@ public function actionReset($id, $code)
 
         if ($model->load(\Yii::$app->getRequest()->post()) && $model->resetPassword($token)) {
             $this->trigger(self::EVENT_AFTER_RESET, $event);
-            return $this->render('/message', [
-                'title'  => \Yii::t('user', 'Password has been changed'),
-                'module' => $this->module,
-            ]);
+            return $this->render('password_change_success');
         }
 
         return $this->render('reset', [

diff --git a/controllers/RegistrationController.php b/controllers/RegistrationController.php
@@ -136,10 +136,7 @@ public function actionRegister()
         if ($model->load(\Yii::$app->request->post()) && $model->register()) {
             $this->trigger(self::EVENT_AFTER_REGISTER, $event);
 
-            return $this->render('/message', [
-                'title'  => \Yii::t('user', 'Your account has been created'),
-                'module' => $this->module,
-            ]);
+            return $this->render('register_success');
         }
 
         return $this->render('register', [

diff --git a/views/recovery/password_change_success.php b/views/recovery/password_change_success.php
@@ -0,0 +1 @@
+<?= \Yii::t('user', 'Password has been changed'); ?>
diff --git a/views/recovery/recovery_token_invalid.php b/views/recovery/recovery_token_invalid.php
@@ -0,0 +1,6 @@
+<?php use yii\helpers\Html; ?>
+
+<?= \Yii::t('user', 'Invalid or expired link'); ?>
+
+<p> <?= Html::a(Yii::t('user', 'Back to Login'), ['//user/security/login'], ['class' => 'btn btn-primary']); ?> </p>
+
diff --git a/views/registration/register_success.php b/views/registration/register_success.php
@@ -0,0 +1 @@
+<?php echo \Yii::t('user', 'Your account has been created'); ?>.