From 1ef8d3a2a994697491a65be07dd8be7b684da7c8 Mon Sep 17 00:00:00 2001
From: Crazywoola <100913391+crazywoola@users.noreply.github.com>
Date: Wed, 8 Jul 2026 16:07:14 +0800
Subject: [PATCH] fix: display errors for oauth page (#38546)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
(cherry picked from commit 5ffd4345dcb6fa2f70767219943b664e4c12c1aa)
---
 eslint-suppressions.json                   |  5 --
 web/app/account/oauth/authorize/layout.tsx | 70 ++++++++--------------
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index e8203d7b903..98c3274df77 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -310,11 +310,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 (
-      <div className="flex min-h-screen w-full justify-center bg-background-default-burn">
-        <Loading />
-      </div>
-    )
-  }
   return (
-    <>
-      <div className={cn('flex min-h-screen w-full justify-center bg-background-default-burn p-6')}>
-        <div className={cn('flex w-full shrink-0 flex-col items-center rounded-2xl border border-effects-highlight bg-background-default-subtle')}>
-          <Header />
-          <div className={cn('flex w-full grow flex-col items-center justify-center px-6 md:px-[108px]')}>
-            <div className="flex flex-col md:w-[400px]">
-              {isLoggedIn
-                ? (
-                    <AppContextProvider>
-                      {children}
-                    </AppContextProvider>
-                  )
-                : children}
-            </div>
+    <div className="flex min-h-screen w-full justify-center bg-background-default-burn p-6">
+      <div className="flex w-full shrink-0 flex-col items-center rounded-2xl border border-effects-highlight bg-background-default-subtle">
+        <Header />
+        <div className="flex w-full grow flex-col items-center justify-center px-6 md:px-[108px]">
+          <div className="flex flex-col md:w-[400px]">
+            {children}
           </div>
-          {systemFeatures.branding.enabled === false && (
-            <div className="px-8 py-6 system-xs-regular text-text-tertiary">
-              ©
-              {' '}
-              {new Date().getFullYear()}
-              {' '}
-              LangGenius, Inc. All rights reserved.
-            </div>
-          )}
         </div>
+        {systemFeatures.branding.enabled === false && (
+          <div className="px-8 py-6 system-xs-regular text-text-tertiary">
+            ©
+            {' '}
+            {copyrightYear}
+            {' '}
+            LangGenius, Inc. All rights reserved.
+          </div>
+        )}
       </div>
-    </>
+    </div>
   )
 }