refactor(auth/error): merge auth/error page to action/action_success

Rhilip · Jul 21, 2019 · 9f02aae · 9f02aae
1 parent b54da2f
commit 9f02aae
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 66 deletions.
diff --git a/apps/components/User/UserTrait.php b/apps/components/User/UserTrait.php
@@ -49,6 +49,7 @@ trait UserTrait
     private $leechtime;
 
     private $invites;
+    private $temp_invites_details;
 
     protected $peer_status;
     protected $infoCacheKey;

diff --git a/apps/controllers/AuthController.php b/apps/controllers/AuthController.php
@@ -24,7 +24,7 @@ public function actionRegister()
             $register_form->setData(app()->request->post());
             $success = $register_form->validate();
             if (!$success) {
-                return $this->render('auth/error', [
+                return $this->render('action/action_fail', [
                     'title' => 'Register Failed',
                     'msg' => $register_form->getError()
                 ]);
@@ -51,13 +51,16 @@ public function actionConfirm()
         $confirm->setData(app()->request->get());
         $success = $confirm->validate();
         if (!$success) {
-            return $this->render('auth/error', [
+            return $this->render('action/action_fail', [
                 'title' => 'Confirm Failed',
                 'msg' => $confirm->getError()
             ]);
         } else {
             $confirm->flush();
-            return $this->render('auth/confirm_success', ['action' => $confirm->action]);
+            return $this->render('action/action_success', [
+                'notice' => $confirm->getConfirmMsg(),
+                'redirect' => '/auth/login'
+            ]);
         }
     }
 
@@ -68,7 +71,7 @@ public function actionRecover()
             $form->setData(app()->request->post());
             $success = $form->validate();
             if (!$success) {
-                return $this->render('auth/error', [
+                return $this->render('action/action_fail', [
                     'title' => 'Action Failed',
                     'msg' => $form->getError()
                 ]);
@@ -77,7 +80,7 @@ public function actionRecover()
                 if ($flush === true) {
                     return $this->render('auth/recover_next_step');
                 } else {
-                    return $this->render('auth/error', [
+                    return $this->render('action/action_fail', [
                         'title' => 'Confirm Failed',
                         'msg' => $flush
                     ]);
@@ -117,7 +120,10 @@ public function actionLogin()
 
                     return app()->response->redirect($return_to);
                 } else {
-                    return $this->render('auth/error', ['title' => 'Login Failed', 'msg' => $success]);
+                    return $this->render('action_fail', [
+                        'title' => 'Login Failed',
+                        'msg' => $success
+                    ]);
                 }
             }
         } else {

diff --git a/apps/models/form/Auth/UserConfirmForm.php b/apps/models/form/Auth/UserConfirmForm.php
@@ -123,4 +123,12 @@ public function flush()
             return $this->flush_recover();
         }
     }
+
+    public function getConfirmMsg() {
+        if ($this->action == self::ACTION_REGISTER) {
+            return 'Your account is success Confirmed.'; // FIXME i18n
+        } elseif ($this->action == self::ACTION_RECOVER) {
+            return 'Your password has been reset and new password has been send to your email, Please find it and login.';
+        }
+    }
 }
diff --git a/apps/views/action/action_success.php b/apps/views/action/action_success.php
@@ -12,7 +12,7 @@
  * @var string $redirect
  */
 
-$redirect = $redirect ?? app()->request->fullUrl();
+$redirect = app()->session->get('redirect') ?? $redirect ?? app()->request->fullUrl();
 ?>
 
 <?= $this->layout('layout/base'); ?>
@@ -30,7 +30,7 @@
 </div>
 <?php $this->end(); ?>
 
-<?php $this->start('script'); ?>
+<?php $this->push('script'); ?>
 <script>
     setTimeout(function () {
         window.location = '<?=  $this->e($redirect) ?>';

diff --git a/apps/views/auth/confirm_success.php b/apps/views/auth/confirm_success.php
diff --git a/apps/views/auth/error.php b/apps/views/auth/error.php
diff --git a/apps/views/error.php b/apps/views/error.php
@@ -25,7 +25,6 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <?php $this->insert('layout/head'); ?>
 
     <title><?= config('base.site_name') ?> :: Error Page -- Powered by <?= config('base.site_generator') ?></title>