From aee282539aa2639b3d05f1af47345d7ee8feaa66 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 12 Jan 2023 16:35:32 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=A4=9A=E5=BC=80=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=20`=E9=94=81=E5=B1=8F`=20=E5=90=8E=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E9=89=B4=E6=9D=83=E5=A4=B1=E8=B4=A5=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/7038?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/session.go | 13 ++++---------
 kernel/util/session.go  |  4 ++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kernel/model/session.go b/kernel/model/session.go
index 0bd276f63..cf92a8031 100644
--- a/kernel/model/session.go
+++ b/kernel/model/session.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/88250/gulu"
-	ginSessions "github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"github.com/siyuan-note/logging"
 	"github.com/siyuan-note/siyuan/kernel/util"
@@ -39,19 +38,15 @@ func LogoutAuth(c *gin.Context) {
 		return
 	}
 
-	session := ginSessions.Default(c)
-	session.Options(ginSessions.Options{
-		Path:   "/",
-		MaxAge: -1,
-	})
-	session.Clear()
-	if err := session.Save(); nil != err {
+	session := util.GetSession(c)
+	util.RemoveWorkspaceSession(session)
+	if err := session.Save(c); nil != err {
 		logging.LogErrorf("saves session failed: " + err.Error())
 		ret.Code = -1
 		ret.Msg = "save session failed"
 	}
 
-	util.ReloadUI()
+	//util.ReloadUI()
 }
 
 func LoginAuth(c *gin.Context) {
diff --git a/kernel/util/session.go b/kernel/util/session.go
index 71e85ea50..e838d6103 100644
--- a/kernel/util/session.go
+++ b/kernel/util/session.go
@@ -80,3 +80,7 @@ func GetWorkspaceSession(session *SessionData) (ret *WorkspaceSession) {
 	}
 	return
 }
+
+func RemoveWorkspaceSession(session *SessionData) {
+	delete(session.Workspaces, WorkspaceDir)
+}