(amoro) branch master updated: [AMORO-2637] Enable return back to origin uri when relogin (#2645)

[jinsongzhou]

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ef7171cb [AMORO-2637] Enable return back to origin uri when relogin 
(#2645)
6ef7171cb is described below

commit 6ef7171cba0f0c4b13ecdf84648030496dc2e53e
Author: tcodehuber <tcodehu...@gmail.com>
AuthorDate: Wed Apr 10 15:04:51 2024 +0800

    [AMORO-2637] Enable return back to origin uri when relogin (#2645)
    
    * [AMORO-2637] Enable return back to origin uri when redirecting to login 
page
    
    * remove unused code
    
    ---------
    
    Co-authored-by: wangtaohz <103108928+wangta...@users.noreply.github.com>
---
 ams/dashboard/src/components/Topbar.vue                 |  4 ++--
 ams/dashboard/src/main.ts                               | 17 ++++++++++++++++-
 .../arctic/server/dashboard/DashboardServer.java        |  1 -
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ams/dashboard/src/components/Topbar.vue 
b/ams/dashboard/src/components/Topbar.vue
index 95a3cb9b6..592c61160 100644
--- 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
index 391273a14..d4809d69a 100644
--- 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
index cf7a91030..1559658d7 100644
--- 
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 class DashboardServer {
           ctx.queryParamMap());
     } else if (needLoginCheck(uriPath)) {
       if (null == ctx.sessionAttribute("user")) {
-        ctx.sessionAttributeMap();
         LOG.info("session info: {}", 
JacksonUtil.toJSONString(ctx.sessionAttributeMap()));
         throw new ForbiddenException();
       }