[AMORO-2637] Enable return back to origin uri when relogin (apache#2645)

* [AMORO-2637] Enable return back to origin uri when redirecting to login page * remove unused code --------- Co-authored-by: wangtaohz <[email protected]>
huyuanfeng2018 · Apr 10, 2024 · 6ef7171 · 6ef7171
1 parent 5faffab
commit 6ef7171
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/ams/dashboard/src/components/Topbar.vue b/ams/dashboard/src/components/Topbar.vue
@@ -131,8 +131,8 @@ export default defineComponent ({
   .topbar-tooltip .ant-tooltip-inner {
     font-size: 12px;
   }
-  .logout-button {
-    border-color: transparent;
+  .logout-button.ant-btn {
+      border: none;
   }
   .logout-button:hover {
     border-color: unset;

diff --git a/ams/dashboard/src/main.ts b/ams/dashboard/src/main.ts
@@ -49,6 +49,21 @@ RegisterComponents(app);
 (async () => {
   try {
     const store = useStore()
+
+    const fromPath = window.location.pathname
+    const fromQuery = window.location.search
+    if (!store.historyPathInfo.path && fromPath!='/login') {
+      const queryParams = new URLSearchParams(fromQuery)
+      const queryObj = {}
+      for (const [key, value] of queryParams.entries()) {
+          queryObj[key] = value
+      }
+      store.setHistoryPath({
+        path: fromPath,
+        query: queryObj
+      })
+    }
+
     const token = getQueryString('token') || ''
     const res = await loginService.getCurUserInfo(token)
     if (res) {
@@ -70,8 +85,8 @@ RegisterComponents(app);
       }
       next()
     })
-    app.use(router)
 
+    app.use(router)
     app.mount('#app')
   }
 })()
diff --git a/ams/server/src/main/java/com/netease/arctic/server/dashboard/DashboardServer.java b/ams/server/src/main/java/com/netease/arctic/server/dashboard/DashboardServer.java
@@ -395,7 +395,6 @@ public void preHandleRequest(Context ctx) {
           ctx.queryParamMap());
     } else if (needLoginCheck(uriPath)) {
       if (null == ctx.sessionAttribute("user")) {
-        ctx.sessionAttributeMap();
         LOG.info("session info: {}", JacksonUtil.toJSONString(ctx.sessionAttributeMap()));
         throw new ForbiddenException();
       }