fix: noauth bugs

src/app/[locale]/agent/components/index.tsx

@@ -6,12 +6,14 @@ import { Button, Col, Row, Spin, Tooltip } from 'antd';
 import classNames from 'classnames';
 import { useTranslations } from 'next-intl';
 import Image from 'next/image';
+import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useQueryState } from 'nuqs';
 import React, { useState } from 'react';
 
 import TitleCom from '@/components/Title';
 import { useAuthContext } from '@/layout/AuthLayout';
+import { setLoginRedirect } from '@/utils/client';
 
 import TagContent from './TagContent';
 import { useStyles } from './styles';
@@ -98,11 +100,24 @@ const Agent = React.memo<AgentProps>(({ agentData, cateData }) => {
                 <Row gutter={[16, 16]}>
                   {(ListData?.GPT?.listGPT?.nodes || []).map((item, index) => (
                     <Col {...layout} key={index}>
-                      <a
+                      <Link
                         className={styles.card}
-                        href={`/chat/new?appNamespace=${item.name?.split(
-                          '/'
-                        )?.[0]}&appName=${item.name?.split('/')?.[1]}`}
+                        href={
+                          authed
+                            ? `/chat/new?appNamespace=${item.name?.split(
+                                '/'
+                              )?.[0]}&appName=${item.name?.split('/')?.[1]}`
+                            : '/oidc/auth'
+                        }
+                        onClick={() => {
+                          if (!authed) {
+                            setLoginRedirect(
+                              `/chat/new?appNamespace=${item.name?.split(
+                                '/'
+                              )?.[0]}&appName=${item.name?.split('/')?.[1]}`
+                            );
+                          }
+                        }}
                       >
                         <div className={styles.left}>
                           <Image alt={item.displayName} height={72} src={item.icon} width={72} />
@@ -119,7 +134,7 @@ const Agent = React.memo<AgentProps>(({ agentData, cateData }) => {
                             <span className={styles.creator}>@{item.creator}</span>
                           </div>
                         </div>
-                      </a>
+                      </Link>
                     </Col>
                   ))}
                 </Row>

src/app/[locale]/chat/layout.tsx

@@ -1,11 +1,21 @@
+'use client';
+
+import { redirect } from 'next/navigation';
 import { ReactNode } from 'react';
 
+import { useAuthContext } from '@/layout/AuthLayout';
+
 type Props = {
   children: ReactNode;
 };
 
 // Since we have a `not-found.tsx` page on the root, a layout file
 // is required, even if it's just passing children through.
 export default function RootLayout({ children }: Props) {
+  const { authed } = useAuthContext();
+  if (authed === false) {
+    // 无效认证
+    redirect('/agent');
+  }
   return children;
 }

src/app/[locale]/oidc/callback/Callback.tsx

@@ -6,13 +6,18 @@ import { useRouter } from 'next/navigation';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 
+import { delLoginRedirect, getLoginRedirect } from '@/utils/client';
 import { AUTH_DATA } from '@/utils/constants';
 
 export default function Callback({ data: res }: { data: any }) {
   const dispatch = useDispatch();
   const t = useTranslations('callback');
   const router = useRouter();
   const saveAuth = async () => {
+    const redirectUrl: string = getLoginRedirect(document.cookie);
+    if (redirectUrl) {
+      delLoginRedirect();
+    }
     if (res?.data?.errors || !res?.data) {
       console.warn(res?.data?.errors);
       notification.warning({
@@ -34,7 +39,7 @@ export default function Callback({ data: res }: { data: any }) {
         type: 'SAVE_AUTH_DATA',
         authData: res.data,
       });
-      router.push('/');
+      router.push(redirectUrl || '/');
     }
   };
   React.useEffect(() => {

src/app/[locale]/oidc/logout/page.tsx

@@ -3,11 +3,13 @@
 import { useRouter } from 'next/navigation';
 import React from 'react';
 
+import { setAxiosHooksWithoutAuth } from '@/utils/axios';
 import { AUTH_DATA } from '@/utils/constants';
 
 export default function Logout() {
   const router = useRouter();
   React.useEffect(() => {
+    setAxiosHooksWithoutAuth();
     window.localStorage.removeItem(AUTH_DATA);
     // router.push('/oidc/remove-auth-and-login'); // 暂时屏蔽登出, 参考, 跳转到未登录的状态
     router.push('/');

src/layout/AppNoAuthLayout/SideBar/SideBarHeader/index.tsx

@@ -18,7 +18,7 @@ const SidebarHeader = () => {
   return (
     <Flex className={styles.sidebarHeader} vertical>
       <div className={styles.logo}>
-        <Link href="/chat">
+        <Link href="/agent">
           <Logo height={32} />
         </Link>
       </div>

src/layout/GlobalLayout/ThemeLayout/index.tsx

@@ -13,7 +13,7 @@ import { useSelector } from 'react-redux';
 import { useAuthContext } from '@/layout/AuthLayout';
 import { GlobalStyle } from '@/styles';
 import { dark, default_theme, light } from '@/theme/themeConfig';
-import { initAxiosHooks } from '@/utils/axios';
+import { setAxiosHooksWithAuth } from '@/utils/axios';
 import { isTokenExpired, setCookie } from '@/utils/client';
 import { AUTH_DATA } from '@/utils/constants';
 
@@ -65,7 +65,7 @@ const ThemeLayout = React.memo<Props>(
       }
       setAuthed(true);
       if (!isAxiosConfigured) {
-        setAxiosConfigured(initAxiosHooks());
+        setAxiosConfigured(setAxiosHooksWithAuth());
       }
     }, [pathname]);
 

src/utils/axios.ts

@@ -38,12 +38,16 @@ export const createCustomAxios = (configs?: CreateAxiosDefaults): AxiosInstance
   return Axios.create(_configs);
 };
 
-export const initAxiosHooks = () => {
+export const setAxiosHooksWithAuth = () => {
   const axios = createCustomAxios();
   configure({ axios });
   return true; // 初始化成功 返回标记
 };
 
+export const setAxiosHooksWithoutAuth = () => {
+  configure({ axios: Axios.create({}) });
+};
+
 export const useAxiosRequest = (
   config: AxiosRequestConfig,
   options?: Options,

src/utils/client.ts

@@ -1,5 +1,7 @@
 'use client';
 
+import { LOGIN_REDIRECT } from './constants';
+
 export { sdk as bff } from '@yuntijs/arcadia-bff-sdk';
 export { sdk as bffClient } from '@yuntijs/bff-client';
 
@@ -91,3 +93,25 @@ export function isTokenExpired(id_token?: string): boolean {
   const expiredTimestampInMs = parseToken(id_token_split_arr).exp * 1000;
   return Date.now() >= expiredTimestampInMs;
 }
+
+/**
+ * 设置登录 redirect
+ * @param {string} redirectUrl: e.g. '/chat'.
+ */
+export function setLoginRedirect(redirectUrl: string) {
+  setCookie(LOGIN_REDIRECT, redirectUrl);
+}
+
+/**
+ * 获取登录 redirect
+ */
+export function getLoginRedirect(cookieString: string) {
+  return getCookie(cookieString, LOGIN_REDIRECT);
+}
+
+/**
+ * 移除登录 redirect
+ */
+export function delLoginRedirect() {
+  setCookie(LOGIN_REDIRECT, '', -1);
+}

src/utils/constants.ts

@@ -1,6 +1,7 @@
 export const AUTH_DATA = 'authData';
 export const DEFAULT_CHAT = 'default_chat';
 export const LOCALE = 'NEXT_LOCALE';
+export const LOGIN_REDIRECT = 'LOGIN_REDIRECT';
 export const AGENT_CATEGORY_INDEXES = [
   'components.index.tuiJian',
   'utils.constants.youXiDongMan',