修复手机号 OAuth 恢复误走邮箱登录

flows/openai/background/steps/oauth-login.js

@@ -50,13 +50,42 @@
       return String(value || '').trim().toLowerCase() === 'phone' ? 'phone' : 'email';
     }
 
+    function isStep7BoundEmailReloginContext(state = {}) {
+      const nodeId = String(
+        state?.nodeId
+        || state?.stepKey
+        || state?.nodeDefinition?.key
+        || state?.stepDefinition?.key
+        || ''
+      ).trim();
+      const phase = String(state?.authLoginPhase || '').trim();
+      return nodeId === 'relogin-bound-email' || phase === 'bound-email-relogin';
+    }
+
+    function resolveForcedStep7IdentifierType(state = {}) {
+      const forcedIdentifierType = normalizeStep7IdentifierType(state?.forceLoginIdentifierType);
+      if (forcedIdentifierType === 'phone') {
+        return 'phone';
+      }
+      if (isStep7BoundEmailReloginContext(state)) {
+        if (forcedIdentifierType === 'email' || Boolean(state?.forceEmailLogin)) {
+          return 'email';
+        }
+      }
+      return '';
+    }
+
     function shouldForceStep7EmailLogin(state = {}) {
-      return normalizeStep7IdentifierType(state?.forceLoginIdentifierType) === 'email'
-        || Boolean(state?.forceEmailLogin);
+      return resolveForcedStep7IdentifierType(state) === 'email';
+    }
+
+    function isPhoneSignupMethodForStep7(state = {}) {
+      return normalizeStep7SignupMethod(state?.signupMethod) === 'phone'
+        || normalizeStep7SignupMethod(state?.resolvedSignupMethod) === 'phone';
     }
 
     function canUseConfiguredPhoneSignup(state = {}) {
-      return normalizeStep7SignupMethod(state?.signupMethod) === 'phone'
+      return isPhoneSignupMethodForStep7(state)
         && Boolean(state?.phoneVerificationEnabled)
         && !Boolean(state?.plusModeEnabled)
         && !Boolean(state?.accountContributionEnabled);
@@ -80,8 +109,9 @@
     }
 
     function resolveStep7LoginIdentifierType(state = {}, fallbackType = '') {
-      if (shouldForceStep7EmailLogin(state)) {
-        return 'email';
+      const forcedIdentifierType = resolveForcedStep7IdentifierType(state);
+      if (forcedIdentifierType) {
+        return forcedIdentifierType;
       }
 
       if (shouldPreferStep7PhoneSignupIdentity(state)) {
@@ -236,6 +266,8 @@
         throw new Error('缺少登录账号：请先完成步骤 2，或在侧栏“注册邮箱/注册手机号”中手动填写账号后再执行当前步骤。');
       }
 
+      const forceEmailLoginForThisRun = shouldForceStep7EmailLogin(state);
+
       let attempt = 0;
       let lastError = null;
 
@@ -243,8 +275,17 @@
         throwIfStopped();
         attempt += 1;
         try {
-          const rawCurrentState = attempt === 1 ? state : await getState();
-          const currentState = shouldForceStep7EmailLogin(state)
+          const rawCurrentState = {
+            ...(attempt === 1 ? state : await getState()),
+            ...(resolvedIdentifierType === 'phone' ? {
+              forceLoginIdentifierType: 'phone',
+              forceEmailLogin: false,
+              accountIdentifierType: 'phone',
+              accountIdentifier: phoneNumber,
+              signupPhoneNumber: phoneNumber,
+            } : {}),
+          };
+          const currentState = forceEmailLoginForThisRun
             ? {
               ...rawCurrentState,
               forceLoginIdentifierType: 'email',