fix(web): 修复mis跳转portal失败的问题 (#1351)

PKUHPC · Jul 10, 2024 · f609a5c · f609a5c
1 parent 8463268
commit f609a5c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/neat-ants-invent.md b/.changeset/neat-ants-invent.md
@@ -0,0 +1,6 @@
+---
+"@scow/portal-web": patch
+"@scow/mis-web": patch
+---
+
+修复 mis 跳转 portal 失败的问题
diff --git a/apps/mis-web/src/layouts/BaseLayout.tsx b/apps/mis-web/src/layouts/BaseLayout.tsx
@@ -14,6 +14,7 @@ import { DesktopOutlined, RobotOutlined } from "@ant-design/icons";
 import { UiExtensionStore } from "@scow/lib-web/build/extensions/UiExtensionStore";
 import { BaseLayout as LibBaseLayout } from "@scow/lib-web/build/layouts/base/BaseLayout";
 import { HeaderNavbarLink } from "@scow/lib-web/build/layouts/base/header";
+import { join } from "path";
 import { PropsWithChildren, useMemo } from "react";
 import { useStore } from "simstate";
 import { LanguageSwitcher } from "src/components/LanguageSwitcher";
@@ -22,7 +23,6 @@ import { getAvailableRoutes } from "src/layouts/routes";
 import { UserStore } from "src/stores/UserStore";
 import { publicConfig } from "src/utils/config";
 
-
 interface Props {
   footerText: string;
   versionTag: string | undefined;
@@ -44,7 +44,7 @@ export const BaseLayout =
   const uiExtensionStore = useStore(UiExtensionStore);
 
   const toCallbackPage = (url: string) => userStore.user
-    ? `${url}/api/auth/callback?token=${userStore.user.token}`
+    ? join(url,`/api/auth/callback?token=${userStore.user.token}`)
     : url;
 
   const navbarLinks: HeaderNavbarLink[] = [];

diff --git a/apps/portal-web/src/layouts/BaseLayout.tsx b/apps/portal-web/src/layouts/BaseLayout.tsx
@@ -14,6 +14,7 @@ import { RobotOutlined } from "@ant-design/icons";
 import { UiExtensionStore } from "@scow/lib-web/build/extensions/UiExtensionStore";
 import { BaseLayout as LibBaseLayout } from "@scow/lib-web/build/layouts/base/BaseLayout";
 import { HeaderNavbarLink } from "@scow/lib-web/build/layouts/base/header";
+import { join } from "path";
 import { PropsWithChildren } from "react";
 import { useStore } from "simstate";
 import { LanguageSwitcher } from "src/components/LanguageSwitcher";
@@ -61,7 +62,7 @@ export const BaseLayout = ({ footerText, versionTag, initialLanguage, children }
   };
 
   const toCallbackPage = (url: string) => userStore.user
-    ? `${url}/api/auth/callback?token=${userStore.user.token}`
+    ? join(url,`/api/auth/callback?token=${userStore.user.token}`)
     : url;
 
   const navbarLinks: HeaderNavbarLink[] = [];