diff --git a/client/web/src/init.tsx b/client/web/src/init.tsx index 43f1a3b4..c7c4b274 100644 --- a/client/web/src/init.tsx +++ b/client/web/src/init.tsx @@ -75,8 +75,11 @@ const backToLoginPage = (() => { return; } - if (window.location.pathname.startsWith('/entry')) { - // 如果已经在入口页面则跳过 + if ( + window.location.pathname.startsWith('/entry') || + window.location.pathname.startsWith('/invite') + ) { + // 如果已经在入口页面或者邀请页面则跳过 return; } diff --git a/client/web/src/routes/Invite/InviteInfo.tsx b/client/web/src/routes/Invite/InviteInfo.tsx index ee51b203..b4cfdd73 100644 --- a/client/web/src/routes/Invite/InviteInfo.tsx +++ b/client/web/src/routes/Invite/InviteInfo.tsx @@ -1,4 +1,4 @@ -import { Avatar } from '@/components/Avatar'; +import { Avatar } from 'tailchat-design'; import { InviteCodeExpiredAt } from '@/components/InviteCodeExpiredAt'; import { LoadingSpinner } from '@/components/LoadingSpinner'; import { UserName } from '@/components/UserName'; diff --git a/client/web/src/routes/Invite/JoinBtn.tsx b/client/web/src/routes/Invite/JoinBtn.tsx index 3441da50..75fe7688 100644 --- a/client/web/src/routes/Invite/JoinBtn.tsx +++ b/client/web/src/routes/Invite/JoinBtn.tsx @@ -21,6 +21,10 @@ export const JoinBtn: React.FC = React.memo((props) => { const history = useHistory(); const { loading, value: isTokenValid } = useAsync(async () => { const token = await getUserJWT(); + if (!token) { + return false; + } + const isTokenValid = await checkTokenValid(token); return isTokenValid; }); diff --git a/server/packages/sdk/src/services/lib/settings.ts b/server/packages/sdk/src/services/lib/settings.ts index d5722f25..16fbcbdb 100644 --- a/server/packages/sdk/src/services/lib/settings.ts +++ b/server/packages/sdk/src/services/lib/settings.ts @@ -55,6 +55,8 @@ export const builtinAuthWhitelist = [ '/user/createTemporaryUser', '/user/resolveToken', '/user/getUserInfo', + '/user/getUserInfoList', + '/user/checkTokenValid', '/group/getGroupBasicInfo', '/group/invite/findInviteByCode', ];