diff --git a/eslint-suppressions.json b/eslint-suppressions.json index 81c7678008c..e141792779d 100644 --- a/eslint-suppressions.json +++ b/eslint-suppressions.json @@ -292,11 +292,6 @@ "count": 1 } }, - "web/app/account/oauth/authorize/layout.tsx": { - "ts/no-explicit-any": { - "count": 1 - } - }, "web/app/account/oauth/authorize/page.tsx": { "ts/no-explicit-any": { "count": 1 diff --git a/web/app/account/oauth/authorize/layout.tsx b/web/app/account/oauth/authorize/layout.tsx index 053baeca925..339624fe027 100644 --- a/web/app/account/oauth/authorize/layout.tsx +++ b/web/app/account/oauth/authorize/layout.tsx @@ -1,60 +1,40 @@ 'use client' -import { cn } from '@langgenius/dify-ui/cn' -import { useQuery, useSuspenseQuery } from '@tanstack/react-query' +import type { ReactNode } from 'react' +import { useSuspenseQuery } from '@tanstack/react-query' -import Loading from '@/app/components/base/loading' import Header from '@/app/signin/_header' -import { AppContextProvider } from '@/context/app-context-provider' -import { isLegacyBase401, userProfileQueryOptions } from '@/features/account-profile/client' import { systemFeaturesQueryOptions } from '@/features/system-features/client' import useDocumentTitle from '@/hooks/use-document-title' -export default function SignInLayout({ children }: any) { +type Props = { + children: ReactNode +} + +const copyrightYear = new Date().getFullYear() + +export default function OAuthAuthorizeLayout({ children }: Props) { const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions()) useDocumentTitle('') - // Probe login state. 401 stays as `error` (not thrown) so this layout can render - // the signin/oauth UI for unauthenticated users; other errors bubble to error.tsx. - // (When unauthenticated, service/base.ts's auto-redirect to /signin still fires.) - const { isPending, data: userResp, error } = useQuery({ - ...userProfileQueryOptions(), - throwOnError: err => !isLegacyBase401(err), - }) - const isLoggedIn = !!userResp && !error - if (isPending) { - return ( -
- -
- ) - } return ( - <> -
-
-
-
-
- {isLoggedIn - ? ( - - {children} - - ) - : children} -
+
+
+
+
+
+ {children}
- {systemFeatures.branding.enabled === false && ( -
- © - {' '} - {new Date().getFullYear()} - {' '} - LangGenius, Inc. All rights reserved. -
- )}
+ {systemFeatures.branding.enabled === false && ( +
+ © + {' '} + {copyrightYear} + {' '} + LangGenius, Inc. All rights reserved. +
+ )}
- +
) }