From cbca3abbd1133270d48d0945b40777982f3226d9 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 4 Jan 2024 09:33:23 +0800
Subject: [PATCH] * Adjust after init user authorize to loadConfigFromDB
 function.

---
 module/common/model.php | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 5c857e4725..a224f48b55 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -29,10 +29,7 @@ class commonModel extends model
         $this->setApproval();
         $this->loadConfigFromDB();
         $this->loadCustomFromDB();
-
-        /* 用户模块在loadConfigFromDB之前就初始化了，所以要手动加载。 */
-        $this->app->loadLang('user');
-        $this->app->loadModuleConfig('user');
+        $this->initAuthorize();
 
         if(!$this->checkIP()) return print($this->lang->ipLimited);
     }
@@ -281,7 +278,6 @@ class commonModel extends model
     {
         if($this->session->user)
         {
-            if(!$this->app->upgrading) $this->session->user->view = $this->loadModel('user')->grantUserView();
             $this->app->user = $this->session->user;
         }
         elseif($this->app->company->guest || (PHP_SAPI == 'cli' && (!isset($_SERVER['RR_MODE']) || $_SERVER['RR_MODE'] == 'jobs')))
@@ -294,9 +290,26 @@ class commonModel extends model
             $user->avatar   = '';
             $user->role     = 'guest';
             $user->admin    = false;
-            $user->rights   = $this->loadModel('user')->authorize('guest');
             $user->groups   = array('group');
             $user->visions  = $this->config->vision;
+            $this->session->set('user', $user);
+            $this->app->user = $this->session->user;
+        }
+    }
+
+    /**
+     * 初始化用户权限和视图。
+     * Init user authorize.
+     *
+     * @access private
+     * @return void
+     */
+    private function initAuthorize()
+    {
+        if(isset($this->app->user))
+        {
+            $user = $this->app->user;
+            $user->rights = $this->loadModel('user')->authorize($user->account);
             if(!$this->app->upgrading) $user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
             $this->session->set('user', $user);
             $this->app->user = $this->session->user;