From aeb60e0cc27f90d2bd8f3635eb5caf1a574ebe61 Mon Sep 17 00:00:00 2001
From: dushixiang <helloworld1024@foxmail.com>
Date: Wed, 26 Oct 2022 22:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E6=9C=AA=E8=B7=B3=E8=BD=AC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/App.js                               | 16 +---------------
 web/src/components/Login.js                  | 11 ++++++++---
 web/src/components/session/OfflineSession.js |  1 -
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/web/src/App.js b/web/src/App.js
index c36df04..b0abeda 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -1,5 +1,5 @@
 import React, {Suspense} from 'react';
-import {Outlet, Route, Routes, useNavigate} from "react-router-dom";
+import {Outlet, Route, Routes} from "react-router-dom";
 
 import './App.css';
 import './Arco.css';
@@ -9,9 +9,6 @@ import UserLayout from "./layout/UserLayout";
 import NoMatch from "./components/NoMatch";
 import Landing from "./components/Landing";
 import NoPermission from "./components/NoPermission";
-import {useQuery} from "react-query";
-import accountApi from "./api/account";
-import {setCurrentUser} from "./service/permission";
 
 const GuacdMonitor = React.lazy(() => import("./components/session/GuacdMonitor"));
 const GuacdPlayback = React.lazy(() => import("./components/session/GuacdPlayback"));
@@ -63,17 +60,6 @@ const LoginPolicy = React.lazy(() => import("./components/security/LoginPolicy")
 
 const App = () => {
 
-    const navigate = useNavigate();
-
-    useQuery('getUserInfo', accountApi.getUserInfo, {
-        onSuccess: (data) => {
-            setCurrentUser(data);
-            if (data?.type === 'user') {
-                navigate('/my-asset');
-            }
-        }
-    });
-
     return (
         <Routes>
             <Route element={
diff --git a/web/src/components/Login.js b/web/src/components/Login.js
index 558250d..fc5caff 100644
--- a/web/src/components/Login.js
+++ b/web/src/components/Login.js
@@ -6,11 +6,15 @@ import {LockOutlined, LockTwoTone, UserOutlined} from '@ant-design/icons';
 import {setToken} from "../utils/utils";
 import brandingApi from "../api/branding";
 import strings from "../utils/strings";
+import {useNavigate} from "react-router-dom";
+import {setCurrentUser} from "../service/permission";
 
 const {Title} = Typography;
 
 const LoginForm = () => {
 
+    const navigate = useNavigate();
+
     let [inLogin, setInLogin] = useState(false);
     let [branding, setBranding] = useState({});
 
@@ -29,12 +33,13 @@ const LoginForm = () => {
         sessionStorage.removeItem('openKeys');
         setToken(data['token']);
 
-        let user = data['user'];
+        let user = data['info'];
+        setCurrentUser(user);
         if (user) {
             if (user['type'] === 'user') {
-                window.location.href = "#/my-asset";
+                navigate('/my-asset');
             } else {
-                window.location.href = "#/";
+                navigate('/');
             }
         }
     }
diff --git a/web/src/components/session/OfflineSession.js b/web/src/components/session/OfflineSession.js
index 323b23b..c0b0207 100644
--- a/web/src/components/session/OfflineSession.js
+++ b/web/src/components/session/OfflineSession.js
@@ -102,7 +102,6 @@ const OfflineSession = () => {
             key: 'option',
             render: (text, record, _, action) => {
                 let disablePlayback = record['recording'] !== '1';
-                let disableCmdRecord = record['commandCount'] === 0;
                 return [
                     <Show menu={'offline-session-playback'} key={'offline-session-playback'}>
                         <Button