From 16a7bcace90e2e82aefe5363d04fa773cf98ae9b Mon Sep 17 00:00:00 2001 From: shuaiplus <2327005759@qq.com> Date: Mon, 2 Mar 2026 22:12:46 +0800 Subject: [PATCH] fix: resolve merge conflict in twoFactorRequiredResponse function --- src/handlers/identity.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/handlers/identity.ts b/src/handlers/identity.ts index a006287..105d7c6 100644 --- a/src/handlers/identity.ts +++ b/src/handlers/identity.ts @@ -31,13 +31,8 @@ function resolveTotpSecret(userSecret: string | null, envSecret: string | undefi function twoFactorRequiredResponse(message: string = 'Two factor required.', includeRecoveryCode: boolean = false): Response { const providers = includeRecoveryCode -<<<<<<< HEAD ? [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR), TWO_FACTOR_PROVIDER_RECOVERY_CODE_RESPONSE] : [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR)]; -======= - ? [TWO_FACTOR_PROVIDER_AUTHENTICATOR, TWO_FACTOR_PROVIDER_RECOVERY_CODE] - : [TWO_FACTOR_PROVIDER_AUTHENTICATOR]; ->>>>>>> 41221998c9142902c5f5be775ea5b4309742a640 const providers2: Record = {}; for (const provider of providers) providers2[provider] = null;