修复手机号登录回退与重发 500 处理

tests/background-step6-retry-limit.test.js

@@ -412,6 +412,62 @@ test('step 7 keeps Plus email login even when phone sms runtime exists', async (
   assert.equal(events.payloads[0].accountIdentifier, 'plus.user@example.com');
 });
 
+test('step 7 keeps phone login after step 8 stores an unbound email for phone signup', async () => {
+  const source = fs.readFileSync('background/steps/oauth-login.js', 'utf8');
+  const globalScope = {};
+  const api = new Function('self', `${source}; return self.MultiPageBackgroundStep7;`)(globalScope);
+
+  const events = {
+    payloads: [],
+  };
+
+  const phoneSignupState = {
+    phoneVerificationEnabled: true,
+    signupMethod: 'phone',
+    resolvedSignupMethod: 'phone',
+    email: 'bound.step8@example.com',
+    accountIdentifierType: 'email',
+    accountIdentifier: 'bound.step8@example.com',
+    signupPhoneNumber: '66959916439',
+    signupPhoneCompletedActivation: {
+      activationId: 'signup-done',
+      phoneNumber: '66959916439',
+      countryId: 52,
+      countryLabel: 'Thailand',
+    },
+    password: 'secret',
+  };
+
+  const executor = api.createStep7Executor({
+    addLog: async () => {},
+    completeStepFromBackground: async () => {},
+    getErrorMessage: (error) => error?.message || String(error || ''),
+    getLoginAuthStateLabel: (state) => state || 'unknown',
+    getState: async () => ({ ...phoneSignupState }),
+    isStep6RecoverableResult: (result) => result?.step6Outcome === 'recoverable',
+    isStep6SuccessResult: (result) => result?.step6Outcome === 'success',
+    refreshOAuthUrlBeforeStep6: async () => 'https://oauth.example/latest',
+    reuseOrCreateTab: async () => {},
+    sendToContentScriptResilient: async (_sourceName, message) => {
+      events.payloads.push(message.payload);
+      return {
+        step6Outcome: 'success',
+        state: 'phone_verification_page',
+        loginVerificationRequestedAt: 123456,
+      };
+    },
+    STEP6_MAX_ATTEMPTS: 3,
+    throwIfStopped: () => {},
+  });
+
+  await executor.executeStep7(phoneSignupState);
+
+  assert.equal(events.payloads[0].loginIdentifierType, 'phone');
+  assert.equal(events.payloads[0].phoneNumber, '66959916439');
+  assert.equal(events.payloads[0].email, '');
+  assert.equal(events.payloads[0].accountIdentifier, '66959916439');
+});
+
 test('step 7 can infer phone login from an available phone signup configuration before step 2 finishes', async () => {
   const source = fs.readFileSync('background/steps/oauth-login.js', 'utf8');
   const globalScope = {};

tests/phone-verification-flow.test.js

@@ -4677,6 +4677,69 @@ test('phone verification helper replaces number immediately when phone-verificat
   assert.equal(messages.includes('RETURN_TO_ADD_PHONE'), true);
 });
 
+test('signup phone verification cancels activation when resend lands on contact-verification HTTP 500 page', async () => {
+  const requests = [];
+  let currentState = {
+    heroSmsApiKey: 'demo-key',
+    heroSmsCountryId: 52,
+    heroSmsCountryLabel: 'Thailand',
+    verificationResendCount: 0,
+    phoneCodeWaitSeconds: 60,
+    phoneCodeTimeoutWindows: 2,
+    phoneCodePollIntervalSeconds: 1,
+    phoneCodePollMaxRounds: 1,
+    signupPhoneActivation: {
+      activationId: '920001',
+      phoneNumber: '66953330001',
+      provider: 'hero-sms',
+      countryId: 52,
+      countryLabel: 'Thailand',
+    },
+  };
+
+  const helpers = api.createPhoneVerificationHelpers({
+    addLog: async () => {},
+    fetchImpl: async (url) => {
+      const parsedUrl = new URL(url);
+      requests.push(parsedUrl);
+      const action = parsedUrl.searchParams.get('action');
+      const id = parsedUrl.searchParams.get('id');
+      if (action === 'getStatus') {
+        return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+      }
+      if (action === 'setStatus') {
+        return { ok: true, text: async () => `STATUS_UPDATED:${id}` };
+      }
+      throw new Error(`Unexpected HeroSMS action: ${action}`);
+    },
+    getState: async () => ({ ...currentState }),
+    sendToContentScriptResilient: async (_source, message) => {
+      if (message.type === 'RESEND_VERIFICATION_CODE') {
+        throw new Error(
+          'PHONE_RESEND_SERVER_ERROR::This page isn\'t working auth.openai.com is currently unable to handle this request. HTTP ERROR 500'
+        );
+      }
+      throw new Error(`Unexpected content-script message: ${message.type}`);
+    },
+    setState: async (updates) => {
+      currentState = { ...currentState, ...updates };
+    },
+    sleepWithStop: async () => {},
+    throwIfStopped: () => {},
+  });
+
+  await assert.rejects(
+    () => helpers.completeSignupPhoneVerificationFlow(1, { state: currentState }),
+    (error) => {
+      assert.match(error.message, /^PHONE_RESEND_SERVER_ERROR::This page isn't working/);
+      assert.equal(error.message.includes('PHONE_RESEND_SERVER_ERROR::PHONE_RESEND_SERVER_ERROR::'), false);
+      return true;
+    }
+  );
+
+  assert.equal(currentState.signupPhoneActivation, null);
+});
+
 test('phone verification helper skips page resend for 5sim timeouts and rotates number directly', async () => {
   const requests = [];
   const messages = [];

tests/step4-split-code-submit.test.js

@@ -166,6 +166,59 @@ return {
   assert.deepStrictEqual(snapshot.clicks, ['Continue']);
 });
 
+test('resendVerificationCode reports contact-verification HTTP 500 after resend click', async () => {
+  const api = new Function(`
+const PHONE_RESEND_SERVER_ERROR_PREFIX = 'PHONE_RESEND_SERVER_ERROR::';
+const CONTACT_VERIFICATION_SERVER_ERROR_PATTERN = /this\\s+page\\s+isn['’]?t\\s+working|currently\\s+unable\\s+to\\s+handle\\s+this\\s+request|http\\s+error\\s+500|500\\s+internal\\s+server\\s+error/i;
+const logs = [];
+const location = {
+  href: 'https://auth.openai.com/email-verification',
+  pathname: '/email-verification',
+};
+const document = {
+  title: 'Verify your email',
+  body: { textContent: 'Enter the verification code.' },
+};
+function throwIfStopped() {}
+function log(message, level = 'info') { logs.push({ message, level }); }
+function findResendVerificationCodeTrigger() { return { textContent: 'Resend code' }; }
+function isActionEnabled() { return true; }
+async function humanPause() {}
+function simulateClick() {
+  location.href = 'https://auth.openai.com/contact-verification';
+  location.pathname = '/contact-verification';
+  document.title = "This page isn't working";
+  document.body.textContent = 'auth.openai.com is currently unable to handle this request. HTTP ERROR 500';
+}
+async function sleep() {}
+function is405MethodNotAllowedPage() { return false; }
+async function handle405ResendError() {}
+function getActionText(element) { return element?.textContent || ''; }
+function getPageTextSnapshot() { return document.body.textContent; }
+
+${extractFunction('getContactVerificationServerErrorText')}
+${extractFunction('throwIfContactVerificationServerError')}
+${extractFunction('resendVerificationCode')}
+
+return {
+  async run() {
+    try {
+      await resendVerificationCode(4, 1000);
+      return { ok: true };
+    } catch (error) {
+      return { ok: false, message: String(error?.message || error), logs };
+    }
+  },
+};
+`)();
+
+  const result = await api.run();
+
+  assert.equal(result.ok, false);
+  assert.match(result.message, /^PHONE_RESEND_SERVER_ERROR::This page isn't working/);
+  assert.equal(result.message.includes('PHONE_RESEND_SERVER_ERROR::PHONE_RESEND_SERVER_ERROR::'), false);
+});
+
 test('fillVerificationCode does not short-circuit on mixed email-verification profile page before verification exits', async () => {
   const api = new Function(`
 const logs = [];