From 59ee5586fe8a178c9aa597b5e5bacfdb79a8d22e Mon Sep 17 00:00:00 2001 From: cnxwzy Date: Tue, 28 Apr 2026 07:49:54 +0800 Subject: [PATCH] fix: preserve oauth login completion step metadata --- background/steps/oauth-login.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/background/steps/oauth-login.js b/background/steps/oauth-login.js index f3209ea..f24178e 100644 --- a/background/steps/oauth-login.js +++ b/background/steps/oauth-login.js @@ -45,6 +45,9 @@ throw new Error('缺少邮箱地址，请先完成步骤 3。'); } + const visibleStep = Math.floor(Number(state?.visibleStep) || 0); + const completionStep = visibleStep > 0 ? visibleStep : 7; + let attempt = 0; let lastError = null; @@ -98,9 +101,17 @@ } if (isStep6SuccessResult(result)) { - await completeStepFromBackground(7, { + const completionPayload = { loginVerificationRequestedAt: result.loginVerificationRequestedAt || null, - }); + }; + if (Object.prototype.hasOwnProperty.call(result || {}, 'skipLoginVerificationStep')) { + completionPayload.skipLoginVerificationStep = Boolean(result.skipLoginVerificationStep); + } + if (Object.prototype.hasOwnProperty.call(result || {}, 'directOAuthConsentPage')) { + completionPayload.directOAuthConsentPage = Boolean(result.directOAuthConsentPage); + } + + await completeStepFromBackground(completionStep, completionPayload); return; }