Merge pull request #7 from NJUPT-SAST/dev-max

fix: 修复跳转
NJUPT-SAST · Mar 20, 2024 · 79a4b20 · 79a4b20
2 parents 6a83877 + fabd19f
commit 79a4b20
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 35 deletions.
diff --git a/app/(tourist)/login/2/page.tsx b/app/(tourist)/login/2/page.tsx
@@ -14,19 +14,17 @@ import { useAppDispatch, useAppSelector } from "@/redux";
 import Link from "next/link";
 import styles from "../page.module.scss";
 import PageTransition from "@/components/pageTransition";
-import { addRedirect, clearLoginMessage } from "@/redux/features/login";
 
 const LoginStep2 = () => {
   const tokenRef = useRef<string>("");
   const dispatch = useAppDispatch();
   const inputRef = useRef<HTMLInputElement>(null);
   const router = useRouter();
   const [loading, setLoading] = useState<boolean>(false);
-  const { redirect, loginTicket } = useAppSelector(
-    (state) => state.loginMessage,
-  );
-  const redirect_uri = useAppSelector((state) => state.loginMessage.redirect);
+  const { loginTicket } = useAppSelector((state) => state.loginMessage);
+  // const redirect_uri = useAppSelector((state) => state.loginMessage.redirect);
   const urlParams = useSearchParams();
+  const redirect_uri = atob(urlParams.get("redirect") ?? "");
   const [error, setError] = useState<
     { error: false } | { error: true; errMsg: string }
   >({ error: false });
@@ -79,12 +77,11 @@ const LoginStep2 = () => {
                           }),
                         );
                         //dispatch(login({ username: "ming", email: data.email }));
-                        if (redirect_uri) {
+                        if (urlParams.get("redirect") !== null) {
                           console.log(redirect_uri);
-                          location.href = redirect_uri;
-                          dispatch(clearLoginMessage());
+                          router.push(redirect_uri);
                         } else {
-                          router.replace(redirect ?? "/home");
+                          router.push(redirect_uri ?? "/home");
                         }
                         return;
                       }
@@ -143,7 +140,7 @@ const LoginStep2 = () => {
               }}
               type="submit"
             >
-              {redirect ? "登录并前往授权" : "登录 SAST Link"}
+              {redirect_uri !== "" ? "登录并前往授权" : "登录 SAST Link"}
             </Button>
             <Button onClick={() => router.replace("../")} type="button" white>
               使用其他账号

diff --git a/app/(tourist)/login/page.tsx b/app/(tourist)/login/page.tsx
@@ -7,24 +7,7 @@ import { useAppDispatch, useAppSelector } from "@/redux";
 import { addRedirect } from "@/redux/features/login";
 
 const Login = () => {
-  const searchParams = useSearchParams();
   // TODO 错误处理
-  function formatRedirectParams(redirectParams: string | null) {
-    if (redirectParams === null) return null;
-    const redirectArray = redirectParams.split("?");
-    if (redirectArray.length > 2) {
-      return redirectArray[0] + "?" + JSON.parse(redirectArray[1]).join("&");
-    }
-    return null;
-  }
-  const redirectParams = searchParams.get("redirect");
-  const redirect = formatRedirectParams(redirectParams);
-  const dispatch = useAppDispatch();
-  useEffect(() => {
-    if (!!redirect) {
-      dispatch(addRedirect(redirect));
-    }
-  }, [redirect, dispatch]);
   return (
     <>
       <LoginStep1 />

diff --git a/app/(user)/auth/page.tsx b/app/(user)/auth/page.tsx
@@ -16,8 +16,8 @@ import { useAppDispatch } from "@/redux";
 import { addRedirect } from "@/redux/features/login";
 
 export default function Auth() {
-  // TODO
-  const appName = "SAST Evento";
+  // TODO 应用名称
+  const appName = "应用";
   const [userData, setUserData] = useState<{ email: string; userId: string }>();
   // 获取参数
   const router = useRouter();
@@ -45,7 +45,7 @@ export default function Auth() {
     (querys as any)[key] = searchParams.get(key);
     return `${key}=${searchParams.get(key)}`;
   });
-  const redirect = `/auth?${querysArray.join("&")}`;
+  const redirect = btoa(`/auth?${querysArray.join("&")}`);
   useEffect(
     () => {
       if (localStorage.getItem("Token") === null) {

diff --git a/app/(user)/home/@appPanel/default.tsx b/app/(user)/home/@appPanel/default.tsx
@@ -12,6 +12,7 @@ import { useAppDispatch, useAppSelector } from "@/redux";
 import { handleHomeAppPanel } from "@/redux/features/panelState";
 import { message } from "@/components/message";
 
+// million-ignore
 const AppPanel = () => {
   const appPanelState = useAppSelector(
     (state) => state.panelState.homeAppPanel,

diff --git a/app/(user)/home/@profilePanel/default.tsx b/app/(user)/home/@profilePanel/default.tsx
@@ -19,7 +19,7 @@ import { useAppSelector } from "@/redux";
 
 const ProfilePanel = () => {
   const userBasicInfo = useAppSelector((state) => state.userBasicInfo);
-  console.log(userBasicInfo);
+  // console.log(userBasicInfo);
   const pathname = usePathname();
   return (
     <>

diff --git a/app/(user)/home/layout.tsx b/app/(user)/home/layout.tsx
@@ -12,7 +12,7 @@ const Layout = (props: {
   profilePanel: ReactNode;
   getInfo: ReactNode;
 }) => {
-  console.log(props);
+  // console.log(props);
   const { children, infoPanel, appPanel, profilePanel, getInfo } = props;
   return (
     <>

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -5,7 +5,7 @@ import { ReduxProvider } from "@/redux/reduxProvider";
 import { SWRProvider } from "@/components/swrProvider";
 import "./globals.scss";
 
-export const metadata = {
+const metadata = {
   title: "SAST Link",
   description: "OAuth of SAST",
 };

diff --git a/components/message/index.tsx b/components/message/index.tsx
@@ -10,6 +10,7 @@ let GlobalMessagePanel: () => JSX.Element | null;
 
 const message = Messagefn();
 
+/*million ignore*/
 function Messagefn() {
   let id: NodeJS.Timeout;
   let dispatch: any = null;

diff --git a/components/topbar/index.tsx b/components/topbar/index.tsx
@@ -10,6 +10,7 @@ import { Logo, MenuIcon } from "../icon";
 import Image from "next/image";
 import avatar from "@public/defaultAvatar.png";
 
+// million-ignore
 const TopBar = () => {
   const dispatch = useAppDispatch();
   const userBasicInfo = useAppSelector((state) => state.userBasicInfo);

diff --git a/components/veriCode/index.tsx b/components/veriCode/index.tsx
@@ -38,7 +38,7 @@ const VeriCode = (props: { reset?: true }) => {
           aria-disabled={clickable}
           onClick={() => {
             setClickable(false);
-            console.log(resetContext.username);
+            // console.log(resetContext.username);
             veriResetAccount(resetContext.username ?? "")
               .then((res) => {
                 if (res.data.Success) {

diff --git a/lib/apis/auth.ts b/lib/apis/auth.ts
@@ -30,7 +30,7 @@ export function oAuth(data: oAuthType) {
     "&" +
     "part=" +
     JSON.parse(localStorage.getItem("Token") ?? "");
-  console.log(query);
+  // console.log(query);
   // TODO 更改为部署后地址
   return (window.location.href = `http://81.68.225.220:8080/api/v1/oauth2/authorize?${query}`);
 }