From ffffaeebf4fee0848d27a175ca8aabbfb2e5e317 Mon Sep 17 00:00:00 2001
From: Chenx221 <chenx221@yandex.com>
Date: Sun, 21 Apr 2024 16:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=BE=AE=E8=B0=83=20?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB=E5=BD=95=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BD=8D=E7=BD=AE=E6=81=A2=E5=A4=8D=E8=87=B3=E4=B8=8E?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/TSParticlesAsset.php    |  2 +-
 controllers/UserController.php | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/assets/TSParticlesAsset.php b/assets/TSParticlesAsset.php
index 923b386..9c4476e 100644
--- a/assets/TSParticlesAsset.php
+++ b/assets/TSParticlesAsset.php
@@ -8,6 +8,6 @@ class TSParticlesAsset extends AssetBundle
 {
     public $sourcePath = '@npm/tsparticles--slim';
     public $js = [
-        'tsparticles.slim.bundle.js',
+        'tsparticles.slim.bundle.min.js',
     ];
 }
\ No newline at end of file
diff --git a/controllers/UserController.php b/controllers/UserController.php
index caed210..bab741b 100644
--- a/controllers/UserController.php
+++ b/controllers/UserController.php
@@ -256,12 +256,7 @@ class UserController extends Controller
                             }
                             LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 1); //login success log
                             Yii::$app->user->login($user, $model->rememberMe ? 3600 * 24 * 30 : 0);
-                            // user to home page, admin to admin/index
-                            if (Yii::$app->user->can('admin')) {
-                                return $this->redirect(['admin/index']);
-                            } else {
-                                return $this->goHome();
-                            }
+                            return $this->goHome();
 
                         }
                     } else {
@@ -317,11 +312,7 @@ class UserController extends Controller
                     LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 1); //login success log
                     Yii::$app->user->login($user, $model->rememberMe ? 3600 * 24 * 30 : 0);
                     Yii::$app->session->remove('login_verification');
-                    if (Yii::$app->user->can('admin')) {
-                        return $this->redirect(['admin/index']);
-                    } else {
-                        return $this->goHome();
-                    }
+                    return $this->goHome();
                 } else {
                     LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 0); //login failed log
                     Yii::$app->session->setFlash('error', '二步验证代码错误');
@@ -341,11 +332,7 @@ class UserController extends Controller
                     LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 1); //login success log
                     Yii::$app->user->login($user, $model->rememberMe ? 3600 * 24 * 30 : 0);
                     Yii::$app->session->remove('login_verification');
-                    if (Yii::$app->user->can('admin')) {
-                        return $this->redirect(['admin/index']);
-                    } else {
-                        return $this->goHome();
-                    }
+                    return $this->goHome();
                 } else {
                     LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 0); //login failed log
                     Yii::$app->session->setFlash('error', '恢复代码错误');
@@ -928,9 +915,6 @@ class UserController extends Controller
             LoginLogs::addLog($user->id, Yii::$app->request->userIP, Yii::$app->request->userAgent, 1); //login success log
             Yii::$app->user->login($user, $remember === 1 ? 3600 * 24 * 30 : 0);
             $publicKeyCredentialSourceRepository1->saveCredential($publicKeyCredentialSource, '', false);
-            if (Yii::$app->user->can('admin')) {
-                return $this->asJson(['verified' => true, 'redirectTo' => 'index.php?r=admin%2Findex']);
-            }
             return $this->asJson(['verified' => true, 'redirectTo' => 'index.php']);
         }
         // Optional, but highly recommended, you can save the credential source as it may be modified