diff --git a/packages/service/support/outLink/schema.ts b/packages/service/support/outLink/schema.ts index 7d1f1dbe3..0c6d5ea4c 100644 --- a/packages/service/support/outLink/schema.ts +++ b/packages/service/support/outLink/schema.ts @@ -92,6 +92,7 @@ OutLinkSchema.virtual('associatedApp', { try { OutLinkSchema.index({ shareId: -1 }); + OutLinkSchema.index({ teamId: 1, tmbId: 1, appId: 1 }); } catch (error) { console.log(error); } diff --git a/projects/app/src/pages/login/fastlogin.tsx b/projects/app/src/pages/login/fastlogin.tsx index fe1da52ae..514a9e476 100644 --- a/projects/app/src/pages/login/fastlogin.tsx +++ b/projects/app/src/pages/login/fastlogin.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react'; import { useRouter } from 'next/router'; import type { ResLogin } from '@/global/support/api/userRes.d'; import { useUserStore } from '@/web/support/user/useUserStore'; -import { clearToken, setToken } from '@/web/support/user/auth'; +import { clearToken } from '@/web/support/user/auth'; import { postFastLogin } from '@/web/support/user/api'; import { useToast } from '@fastgpt/web/hooks/useToast'; import Loading from '@fastgpt/web/components/common/MyLoading'; @@ -24,7 +24,6 @@ const FastLogin = ({ const { t } = useTranslation(); const loginSuccess = useCallback( (res: ResLogin) => { - setToken(res.token); setUserInfo(res.user); setTimeout(() => { diff --git a/projects/app/src/pages/login/index.tsx b/projects/app/src/pages/login/index.tsx index 84807bdfa..fd12521db 100644 --- a/projects/app/src/pages/login/index.tsx +++ b/projects/app/src/pages/login/index.tsx @@ -18,7 +18,7 @@ import { useUserStore } from '@/web/support/user/useUserStore'; import { useChatStore } from '@/web/core/chat/context/useChatStore'; import dynamic from 'next/dynamic'; import { serviceSideProps } from '@fastgpt/web/common/system/nextjs'; -import { clearToken, setToken } from '@/web/support/user/auth'; +import { clearToken } from '@/web/support/user/auth'; import Script from 'next/script'; import Loading from '@fastgpt/web/components/common/MyLoading'; import { useLocalStorageState, useMount } from 'ahooks'; @@ -60,7 +60,6 @@ const Login = ({ ChineseRedirectUrl }: { ChineseRedirectUrl: string }) => { const loginSuccess = useCallback( (res: ResLogin) => { setUserInfo(res.user); - setToken(res.token); const decodeLastRoute = decodeURIComponent(lastRoute); // 检查是否是当前的 route diff --git a/projects/app/src/pages/login/provider.tsx b/projects/app/src/pages/login/provider.tsx index d6f0371eb..8bb0080a1 100644 --- a/projects/app/src/pages/login/provider.tsx +++ b/projects/app/src/pages/login/provider.tsx @@ -3,7 +3,7 @@ import { useRouter } from 'next/router'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import type { ResLogin } from '@/global/support/api/userRes.d'; import { useUserStore } from '@/web/support/user/useUserStore'; -import { clearToken, setToken } from '@/web/support/user/auth'; +import { clearToken } from '@/web/support/user/auth'; import { oauthLogin } from '@/web/support/user/api'; import { useToast } from '@fastgpt/web/hooks/useToast'; import Loading from '@fastgpt/web/components/common/MyLoading'; @@ -24,7 +24,6 @@ const provider = () => { const loginSuccess = useCallback( (res: ResLogin) => { - setToken(res.token); setUserInfo(res.user); router.push(loginStore?.lastRoute ? decodeURIComponent(loginStore?.lastRoute) : '/app/list'); diff --git a/projects/app/src/pages/price/index.tsx b/projects/app/src/pages/price/index.tsx index 7084e775f..33d6fd987 100644 --- a/projects/app/src/pages/price/index.tsx +++ b/projects/app/src/pages/price/index.tsx @@ -9,7 +9,6 @@ import StandardPlan from './components/Standard'; import ExtraPlan from './components/ExtraPlan'; import PointsCard from './components/Points'; import FAQ from './components/FAQ'; -import { getToken } from '@/web/support/user/auth'; import { useTranslation } from 'next-i18next'; import MyIcon from '@fastgpt/web/components/common/Icon'; import { useSystemStore } from '@/web/common/system/useSystemStore'; @@ -22,7 +21,7 @@ const PriceBox = () => { const router = useRouter(); const { data: teamSubPlan } = useQuery(['getTeamPlanStatus'], getTeamPlanStatus, { - enabled: !!getToken() || !!userInfo + enabled: !!userInfo }); const onPaySuccess = () => { diff --git a/projects/app/src/web/support/user/auth.ts b/projects/app/src/web/support/user/auth.ts index c667f9b71..be483820a 100644 --- a/projects/app/src/web/support/user/auth.ts +++ b/projects/app/src/web/support/user/auth.ts @@ -1,20 +1,9 @@ import { loginOut } from '@/web/support/user/api'; -const tokenKey = 'token'; export const clearToken = () => { try { - localStorage.removeItem(tokenKey); return loginOut(); } catch (error) { error; } }; - -export const setToken = (token: string) => { - if (typeof window === 'undefined') return ''; - localStorage.setItem(tokenKey, token); -}; -export const getToken = () => { - if (typeof window === 'undefined') return ''; - return localStorage.getItem(tokenKey) || ''; -};