Revert "Integrate Plus hosted session binding"

This reverts commit 3aa9b136d3.

background/plus-hosted-checkout-success.js

@@ -1,153 +0,0 @@
-(function attachPlusHostedCheckoutSuccess(root, factory) {
-  root.MultiPagePlusHostedCheckoutSuccess = factory();
-})(typeof self !== 'undefined' ? self : globalThis, function createPlusHostedCheckoutSuccessModule() {
-  const PAYMENT_SUCCESS_URL_PATTERN = /^https:\/\/(?:chatgpt\.com|www\.chatgpt\.com|chat\.openai\.com)\/(?:backend-api\/)?payments\/success(?:[/?#]|$)/i;
-  const PLUS_CHECKOUT_NODE_ID = 'plus-checkout-create';
-  const PLUS_PAYMENT_METHOD_PAYPAL = 'paypal';
-
-  function normalizeString(value = '') {
-    return String(value || '').trim();
-  }
-
-  function normalizePaymentMethod(value = '') {
-    return normalizeString(value).toLowerCase();
-  }
-
-  function isPaymentSuccessUrl(url = '') {
-    return PAYMENT_SUCCESS_URL_PATTERN.test(normalizeString(url));
-  }
-
-  function isRunnableNodeStatus(value = '') {
-    const normalized = normalizeString(value).toLowerCase();
-    return !normalized || normalized === 'pending' || normalized === 'running';
-  }
-
-  function isHostedCheckoutSuccessWaitActive(state = {}, tabId = null) {
-    if (!state || typeof state !== 'object') {
-      return false;
-    }
-    if (!state.plusModeEnabled) {
-      return false;
-    }
-    if (normalizePaymentMethod(state.plusPaymentMethod) !== PLUS_PAYMENT_METHOD_PAYPAL) {
-      return false;
-    }
-    if (state.plusHostedCheckoutCompletionPending !== true) {
-      return false;
-    }
-
-    const checkoutTabId = Number(state.plusCheckoutTabId);
-    if (!Number.isInteger(checkoutTabId) || checkoutTabId <= 0) {
-      return false;
-    }
-    if (tabId !== null && checkoutTabId !== Number(tabId)) {
-      return false;
-    }
-
-    return isRunnableNodeStatus(state.nodeStatuses?.[PLUS_CHECKOUT_NODE_ID]);
-  }
-
-  function createPlusHostedCheckoutSuccessManager(deps = {}) {
-    const {
-      addLog: rawAddLog = async () => {},
-      completeNodeFromBackground = null,
-      failNodeFromBackground = null,
-      getState = async () => ({}),
-      setState = async () => {},
-    } = deps;
-
-    const activeTabIds = new Set();
-
-    function addLog(message, level = 'info', options = {}) {
-      return rawAddLog(message, level, {
-        stepKey: PLUS_CHECKOUT_NODE_ID,
-        nodeId: PLUS_CHECKOUT_NODE_ID,
-        ...(options && typeof options === 'object' ? options : {}),
-      });
-    }
-
-    async function completeFromSuccessTab(tabId, successUrl = '') {
-      const numericTabId = Number(tabId);
-      if (!Number.isInteger(numericTabId) || numericTabId <= 0) {
-        return null;
-      }
-      if (activeTabIds.has(numericTabId)) {
-        return null;
-      }
-      activeTabIds.add(numericTabId);
-
-      try {
-        const initialState = await getState();
-        if (!isHostedCheckoutSuccessWaitActive(initialState, numericTabId)) {
-          return null;
-        }
-
-        const latestState = await getState();
-        if (!isHostedCheckoutSuccessWaitActive(latestState, numericTabId)) {
-          return null;
-        }
-
-        const normalizedSuccessUrl = normalizeString(successUrl);
-        await setState({
-          plusReturnUrl: normalizedSuccessUrl,
-        });
-        await addLog('Detected ChatGPT payment success page; continuing Plus session import flow.', 'ok');
-
-        if (typeof completeNodeFromBackground === 'function') {
-          await completeNodeFromBackground(PLUS_CHECKOUT_NODE_ID, {
-            plusReturnUrl: normalizedSuccessUrl,
-            plusHostedCheckoutCompleted: true,
-          });
-        }
-
-        await setState({
-          plusHostedCheckoutCompletionPending: false,
-          plusHostedCheckoutCompleted: true,
-        });
-
-        return {
-          completed: true,
-          plusReturnUrl: normalizedSuccessUrl,
-        };
-      } catch (error) {
-        const message = normalizeString(error?.message) || 'unknown error';
-        await addLog(`Failed to continue after ChatGPT payment success page: ${message}`, 'error');
-        if (typeof failNodeFromBackground === 'function') {
-          await failNodeFromBackground(PLUS_CHECKOUT_NODE_ID, message);
-          return {
-            completed: false,
-            failed: true,
-            message,
-          };
-        }
-        throw error;
-      } finally {
-        activeTabIds.delete(numericTabId);
-      }
-    }
-
-    async function handleTabUpdated(tabId, changeInfo = {}, tab = {}) {
-      if (changeInfo?.status !== 'complete' && tab?.status !== 'complete') {
-        return null;
-      }
-      const nextUrl = normalizeString(changeInfo?.url || tab?.url);
-      if (!isPaymentSuccessUrl(nextUrl)) {
-        return null;
-      }
-      return completeFromSuccessTab(tabId, nextUrl);
-    }
-
-    return {
-      completeFromSuccessTab,
-      handleTabUpdated,
-      isHostedCheckoutSuccessWaitActive,
-      isPaymentSuccessUrl,
-    };
-  }
-
-  return {
-    createPlusHostedCheckoutSuccessManager,
-    isHostedCheckoutSuccessWaitActive,
-    isPaymentSuccessUrl,
-  };
-});

background/steps/create-plus-checkout.js

@@ -7,8 +7,6 @@
   const PLUS_PAYMENT_METHOD_PAYPAL = 'paypal';
   const PLUS_PAYMENT_METHOD_GOPAY = 'gopay';
   const PLUS_PAYMENT_METHOD_GPC_HELPER = 'gpc-helper';
-  const PLUS_ACCOUNT_ACCESS_STRATEGY_SUB2API_CODEX_SESSION = 'sub2api_codex_session';
-  const PLUS_ACCOUNT_ACCESS_STRATEGY_CPA_CODEX_SESSION = 'cpa_codex_session';
   const DEFAULT_GPC_HELPER_API_URL = 'https://gpc.qlhazycoder.top';
   const GPC_HELPER_PHONE_MODE_AUTO = 'auto';
   const GPC_HELPER_PHONE_MODE_MANUAL = 'manual';
@@ -49,17 +47,6 @@
       return normalized === PLUS_PAYMENT_METHOD_GOPAY ? PLUS_PAYMENT_METHOD_GOPAY : PLUS_PAYMENT_METHOD_PAYPAL;
     }
 
-    function normalizePlusAccountAccessStrategy(value = '') {
-      const normalized = String(value || '').trim().toLowerCase();
-      if (normalized === PLUS_ACCOUNT_ACCESS_STRATEGY_SUB2API_CODEX_SESSION) {
-        return PLUS_ACCOUNT_ACCESS_STRATEGY_SUB2API_CODEX_SESSION;
-      }
-      if (normalized === PLUS_ACCOUNT_ACCESS_STRATEGY_CPA_CODEX_SESSION) {
-        return PLUS_ACCOUNT_ACCESS_STRATEGY_CPA_CODEX_SESSION;
-      }
-      return 'oauth';
-    }
-
     function getCheckoutModeLabel(state = {}) {
       const paymentMethod = normalizePlusPaymentMethod(state?.plusPaymentMethod);
       if (paymentMethod === PLUS_PAYMENT_METHOD_GPC_HELPER) {
@@ -76,25 +63,6 @@
       return paymentMethod === PLUS_PAYMENT_METHOD_GOPAY ? 'GoPay' : 'PayPal';
     }
 
-    function shouldWaitForHostedCheckoutSuccess(state = {}, paymentMethod = PLUS_PAYMENT_METHOD_PAYPAL) {
-      if (!state?.plusModeEnabled) {
-        return false;
-      }
-      if (normalizePlusPaymentMethod(paymentMethod) !== PLUS_PAYMENT_METHOD_PAYPAL) {
-        return false;
-      }
-      const signupMethod = String(state?.resolvedSignupMethod || state?.signupMethod || 'email').trim().toLowerCase();
-      if (signupMethod === 'phone') {
-        return false;
-      }
-      if (Boolean(state?.accountContributionEnabled)) {
-        return true;
-      }
-      const strategy = normalizePlusAccountAccessStrategy(state?.plusAccountAccessStrategy);
-      return strategy === PLUS_ACCOUNT_ACCESS_STRATEGY_SUB2API_CODEX_SESSION
-        || strategy === PLUS_ACCOUNT_ACCESS_STRATEGY_CPA_CODEX_SESSION;
-    }
-
     async function openFreshChatGptTabForCheckoutCreate() {
       const tab = typeof createAutomationTab === 'function'
         ? await createAutomationTab({ url: PLUS_CHECKOUT_ENTRY_URL, active: true })
@@ -471,8 +439,6 @@
         plusCheckoutCountry: result.country || 'ID',
         plusCheckoutCurrency: result.currency || 'IDR',
         plusCheckoutSource: result.checkoutSource,
-        plusHostedCheckoutCompletionPending: false,
-        plusHostedCheckoutCompleted: false,
         gopayHelperTaskId: result.taskId,
         gopayHelperTaskStatus: result.taskStatus,
         gopayHelperStatusText: result.statusText,
@@ -518,14 +484,10 @@
         logMessage: '步骤 6：正在等待 ChatGPT 页面完成加载，再继续创建订阅页...',
       });
 
-      const waitForHostedSuccess = shouldWaitForHostedCheckoutSuccess(state, paymentMethod);
       const result = await sendTabMessageUntilStopped(tabId, PLUS_CHECKOUT_SOURCE, {
         type: 'CREATE_PLUS_CHECKOUT',
         source: 'background',
-        payload: {
-          paymentMethod,
-          ...(waitForHostedSuccess ? { hostedCheckoutMode: true } : {}),
-        },
+        payload: { paymentMethod },
       });
 
       if (result?.error) {
@@ -534,10 +496,9 @@
       if (!result?.checkoutUrl) {
         throw new Error(`步骤 6：${checkoutModeLabel}未返回可用的订阅链接。`);
       }
-      const checkoutUrl = String(result.checkoutUrl || '').trim();
 
       await addLog(`步骤 6：${checkoutModeLabel}已创建，正在打开订阅页面...`, 'ok');
-      await chrome.tabs.update(tabId, { url: checkoutUrl, active: true });
+      await chrome.tabs.update(tabId, { url: result.checkoutUrl, active: true });
       await waitForTabCompleteUntilStopped(tabId);
       await sleepWithStop(1000);
       await ensureContentScriptReadyOnTabUntilStopped(PLUS_CHECKOUT_SOURCE, tabId, {
@@ -548,22 +509,14 @@
 
       await setState({
         plusCheckoutTabId: tabId,
-        plusCheckoutUrl: checkoutUrl,
+        plusCheckoutUrl: result.checkoutUrl,
         plusCheckoutCountry: result.country || 'DE',
         plusCheckoutCurrency: result.currency || 'EUR',
         plusCheckoutSource: '',
-        plusReturnUrl: '',
-        plusHostedCheckoutCompletionPending: waitForHostedSuccess,
-        plusHostedCheckoutCompleted: false,
       });
 
       await addLog(`步骤 6：Plus Checkout 页面已就绪（${paymentMethodLabel} / ${result.country || 'DE'} ${result.currency || 'EUR'}），准备继续下一步。`, 'info');
 
-      if (waitForHostedSuccess) {
-        await addLog('Step 6: PayPal hosted checkout is open; waiting for the ChatGPT payment success page before importing the Plus session.', 'info');
-        return;
-      }
-
       await completeNodeFromBackground('plus-checkout-create', {
         plusCheckoutCountry: result.country || 'DE',
         plusCheckoutCurrency: result.currency || 'EUR',