UserAuthService.php 修复因为隐藏password导致user模型 toarray之后无法获取password导致登录流…

…程出错的问题
mineadmin · Jul 5, 2024 · b11c510 · b11c510
1 parent 6dee2dd
commit b11c510
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/app/System/Service/Dependencies/UserAuthService.php b/app/System/Service/Dependencies/UserAuthService.php
@@ -45,14 +45,15 @@ public function login(UserServiceVo $userServiceVo): string
         $mapper = container()->get(SystemUserMapper::class);
         try {
             event(new UserLoginBefore(['username' => $userServiceVo->getUsername(), 'password' => $userServiceVo->getPassword()]));
-            $userinfo = $mapper->checkUserByUsername($userServiceVo->getUsername())->toArray();
-            $password = $userinfo['password'];
-            unset($userinfo['password']);
-            $userLoginAfter = new UserLoginAfter($userinfo);
-            if ($mapper->checkPass($userServiceVo->getPassword(), $password)) {
+            /**
+             * @var SystemUser $userinfo
+             */
+            $userinfo = $mapper->checkUserByUsername($userServiceVo->getUsername());
+            $userLoginAfter = new UserLoginAfter($userinfo->toArray());
+            if ($mapper->checkPass($userServiceVo->getPassword(), $userinfo->password)) {
                 if (
-                    ($userinfo['status'] == SystemUser::USER_NORMAL)
-                    || ($userinfo['status'] == SystemUser::USER_BAN && $userinfo['id'] == env('SUPER_ADMIN'))
+                    ($userinfo->status == SystemUser::USER_NORMAL)
+                    || ($userinfo->status == SystemUser::USER_BAN && $userinfo->getKeyName() == env('SUPER_ADMIN'))
                 ) {
                     $userLoginAfter->message = t('jwt.login_success');
                     $token = user()->getToken($userLoginAfter->userinfo);