From 4203d0e786f319529ffb18ea22cb829affd61a5c Mon Sep 17 00:00:00 2001
From: ZhuangYumin <zhuangyumin@sjtu.edu.cn>
Date: Sat, 16 Dec 2023 09:45:46 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=94=AF=E6=8C=81=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E4=BC=9A=E8=AF=9D=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E9=87=8D=E7=BD=AE=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E6=97=A7=E4=BC=9A=E8=AF=9D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/Web/index.html    |  1 -
 frontend/Web/login.html    |  1 -
 frontend/Web/passwd.html   | 15 ++++++---------
 frontend/Web/register.html |  1 -
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/frontend/Web/index.html b/frontend/Web/index.html
index b3abc37..f398f7a 100644
--- a/frontend/Web/index.html
+++ b/frontend/Web/index.html
@@ -133,7 +133,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
diff --git a/frontend/Web/login.html b/frontend/Web/login.html
index b2cfe36..cecc75f 100644
--- a/frontend/Web/login.html
+++ b/frontend/Web/login.html
@@ -171,7 +171,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
diff --git a/frontend/Web/passwd.html b/frontend/Web/passwd.html
index ada0800..848e864 100644
--- a/frontend/Web/passwd.html
+++ b/frontend/Web/passwd.html
@@ -172,7 +172,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>
@@ -240,6 +239,12 @@
     }
     document.addEventListener('SessionReady', async () => {
       await UpdateUserInfo();
+      if((await GetMyPrivilege())<1)
+      {
+        document.querySelector('.passwd-box').style.display = 'none';
+        document.querySelector('.content').innerHTML = '<div class="info-box"><h2>Please log in first.</h2><p>Redirecting to home page in 3 seconds...</p></div>';
+        setTimeout(function(){window.location.href="/";},3000);
+      }
     });
     async function TryPasswd()
     {
@@ -260,14 +265,6 @@
         setTimeout(function(){window.location.href="/";},3000);
       }
     }
-    (async () => {
-      if((await GetMyPrivilege())<1)
-      {
-        document.querySelector('.passwd-box').style.display = 'none';
-        document.querySelector('.content').innerHTML = '<div class="info-box"><h2>Please log in first.</h2><p>Redirecting to home page in 3 seconds...</p></div>';
-        setTimeout(function(){window.location.href="/";},3000);
-      }
-    })();
   </script>
   <script src="/sessioninit.js"></script>
 </body>
diff --git a/frontend/Web/register.html b/frontend/Web/register.html
index 7d19af4..43831a5 100644
--- a/frontend/Web/register.html
+++ b/frontend/Web/register.html
@@ -172,7 +172,6 @@
           <div class="dropdown-content">
             <a href="/login">Login</a>
             <a href="#" onclick="(async () => { await Request('logout'); await UpdateUserInfo(); })();">Logout</a>
-            <a href="#" onclick="localStorage.removeItem('session_token'); localStorage.removeItem('outhentication_key'); localStorage.removeItem('operation_count'); window.close();">Close Session</a>
             <a href="/register">Register</a>
             <a href="/passwd">Change Password</a>
             <a href="#">Admin Panel</a>