From d074f1a8134a5d431561ba067fc638bad07aeed8 Mon Sep 17 00:00:00 2001
From: chenhang <averych@126.com>
Date: Wed, 17 Jun 2026 17:07:53 +0800
Subject: [PATCH 1/2] fix(auth): hide email option in other sign-in dialog

---
 src/app/auth/components/auth-email-panel.tsx  |  3 ---
 .../auth/components/auth-facebook-panel.tsx   |  8 +-------
 .../components/auth-other-options-dialog.tsx  | 19 +++----------------
 src/app/auth/components/auth-panel.tsx        |  4 +---
 4 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/app/auth/components/auth-email-panel.tsx b/src/app/auth/components/auth-email-panel.tsx
index e486d614..8350ab59 100644
--- a/src/app/auth/components/auth-email-panel.tsx
+++ b/src/app/auth/components/auth-email-panel.tsx
@@ -112,9 +112,6 @@ export function AuthEmailPanel({
           setShowOptions(false);
           onGoogle?.();
         }}
-        onEmail={() => {
-          // 在 email 模式下不再显示 Email 入口
-        }}
         googleSlot={googleSlot}
       />
     </div>
diff --git a/src/app/auth/components/auth-facebook-panel.tsx b/src/app/auth/components/auth-facebook-panel.tsx
index 830f55f2..55f40d9a 100644
--- a/src/app/auth/components/auth-facebook-panel.tsx
+++ b/src/app/auth/components/auth-facebook-panel.tsx
@@ -11,7 +11,6 @@
  *     `AuthGoogleLoginSubmitted` 事件，状态机内部调 next-auth/react 的 signIn(provider)
  *   - busy / error 状态来自 `useAuthState()`（与邮箱登录同源）
  *   - "Other Sign-in Options" 链接打开底部弹层
- *   - 弹层 Email 按钮 → 触发 `onSwitchToEmail`（父级派发 `AuthPanelModeChanged`）
  */
 import Image from "next/image";
 import { useState } from "react";
@@ -24,11 +23,7 @@ import { AuthOtherOptionsDialog } from "./auth-other-options-dialog";
 import { AuthProviderIcon } from "./auth-provider-icon";
 import styles from "./auth-facebook-panel.module.css";
 
-export interface AuthFacebookPanelProps {
-  onSwitchToEmail: () => void;
-}
-
-export function AuthFacebookPanel({ onSwitchToEmail }: AuthFacebookPanelProps) {
+export function AuthFacebookPanel() {
   const [showOptions, setShowOptions] = useState(false);
   const { isLoading, errorMessage } = useAuthState();
   const authDispatch = useAuthDispatch();
@@ -98,7 +93,6 @@ export function AuthFacebookPanel({ onSwitchToEmail }: AuthFacebookPanelProps) {
         mode="facebook"
         onFacebook={() => handleFacebook()}
         onGoogle={() => handleGoogle()}
-        onEmail={onSwitchToEmail}
       />
     </div>
   );
diff --git a/src/app/auth/components/auth-other-options-dialog.tsx b/src/app/auth/components/auth-other-options-dialog.tsx
index 650eb027..e0afb162 100644
--- a/src/app/auth/components/auth-other-options-dialog.tsx
+++ b/src/app/auth/components/auth-other-options-dialog.tsx
@@ -9,12 +9,11 @@
  *   - 固定底部、宽 100%（≤500px）、顶部圆角 28px
  *   - drag handle 40×4 灰胶囊
  *   - 标题 "Other Sign-in Options" 24px bold 深色
- *   - 条件渲染 Email / Facebook 按钮（40px 白胶囊 + 边框 + 图标）
+ *   - email 模式下渲染 Facebook 按钮（40px 白胶囊 + 边框 + 图标）
  *   - 始终渲染 Google 按钮
  *   - Cancel 文本按钮
  */
 import type { ReactNode } from "react";
-import { Mail } from "lucide-react";
 
 import { BottomSheet } from "@/app/_components/core/bottom-sheet";
 
@@ -27,7 +26,6 @@ export interface AuthOtherOptionsDialogProps {
   onClose: () => void;
   onFacebook: () => void;
   onGoogle: () => void;
-  onEmail: () => void;
   /** 当前面板模式：facebook 模式下显示 Email + Google；email 模式下显示 Facebook + Google。 */
   mode: "facebook" | "email";
   /** 自定义子节点（如嵌入 GIS 按钮） */
@@ -39,7 +37,6 @@ export function AuthOtherOptionsDialog({
   onClose,
   onFacebook,
   onGoogle,
-  onEmail,
   mode,
   googleSlot,
 }: AuthOtherOptionsDialogProps) {
@@ -53,17 +50,7 @@ export function AuthOtherOptionsDialog({
         <div className={styles.handle} aria-hidden="true" />
         <h2 className={styles.title}>Other Sign-in Options</h2>
 
-        {mode === "facebook" ? (
-          <AuthSocialButton
-            icon={<Mail size={20} aria-hidden="true" />}
-            onClick={() => {
-              onClose();
-              onEmail();
-            }}
-          >
-            Email Sign In / Register
-          </AuthSocialButton>
-        ) : (
+        {mode === "email" ? (
           <AuthSocialButton
             icon={<AuthProviderIcon provider="facebook" />}
             onClick={() => {
@@ -73,7 +60,7 @@ export function AuthOtherOptionsDialog({
           >
             Facebook Sign In
           </AuthSocialButton>
-        )}
+        ) : null}
 
         {googleSlot ? (
           <div className={styles.googleSlot}>{googleSlot}</div>
diff --git a/src/app/auth/components/auth-panel.tsx b/src/app/auth/components/auth-panel.tsx
index f4185645..6fad6888 100644
--- a/src/app/auth/components/auth-panel.tsx
+++ b/src/app/auth/components/auth-panel.tsx
@@ -16,8 +16,6 @@ export function AuthPanel() {
   const dispatch = useAuthDispatch();
   const router = useRouter();
 
-  const switchToEmail = () =>
-    dispatch({ type: "AuthPanelModeChanged", mode: "email" });
   const switchToFacebook = () =>
     dispatch({ type: "AuthPanelModeChanged", mode: "facebook" });
 
@@ -41,7 +39,7 @@ export function AuthPanel() {
       </button>
 
       {state.authPanelMode === "facebook" ? (
-        <AuthFacebookPanel onSwitchToEmail={switchToEmail} />
+        <AuthFacebookPanel />
       ) : (
         <AuthEmailPanel
           onSwitchToFacebook={() => {

From afba85e809e0605155ec2d8d1e7e05793542ee1d Mon Sep 17 00:00:00 2001
From: chenhang <averych@126.com>
Date: Wed, 17 Jun 2026 17:11:34 +0800
Subject: [PATCH 2/2] fix(auth): update routing for subscription access

---
 src/app/chat/components/chat-quota-exhausted-banner.tsx | 2 +-
 src/stores/auth/auth-status-checker.tsx                 | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/chat/components/chat-quota-exhausted-banner.tsx b/src/app/chat/components/chat-quota-exhausted-banner.tsx
index 96dbb2b4..b19addf1 100644
--- a/src/app/chat/components/chat-quota-exhausted-banner.tsx
+++ b/src/app/chat/components/chat-quota-exhausted-banner.tsx
@@ -45,7 +45,7 @@ export function ChatQuotaExhaustedBanner({
       onUnlock();
       return;
     }
-    router.push(ROUTES.subscription);
+    router.push(ROUTES.auth);
   };
 
   return (
diff --git a/src/stores/auth/auth-status-checker.tsx b/src/stores/auth/auth-status-checker.tsx
index 21023c1c..c6de20b0 100644
--- a/src/stores/auth/auth-status-checker.tsx
+++ b/src/stores/auth/auth-status-checker.tsx
@@ -4,12 +4,6 @@
  *
  * 派发时机：仅 mount 时一次（`useEffect` deps = `[dispatch]`，永远不重跑）。
  *
- * 与原 `AuthStatusCheckSubmitted` 的区别：
- *   - 原版本有两个 useEffect：① mount + ② loginStatus 变化 re-check
- *   - re-check 是 dead code —— 状态机 onDone 已经把 loginStatus 写对，
- *     再读 storage 只会拿到相同值（no-op），徒增死循环防护复杂度
- *   - 新版本只保留 ①，命名 `AuthInit` 与 `UserInit` 对齐（user-machine 的同模式）
- *
  * 与 <OAuthSessionSync /> 平级：
  *   - AuthStatusChecker: 启动时一次性 init（"自己启动时同步"）
  *   - OAuthSessionSync:   持续监听 NextAuth session（"别人在写"）