Buriburizaemon/nodewarden
1
0
Fork 0
mirror of https://github.com/shuaiplus/nodewarden.git synced 2026-06-20 13:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflict in twoFactorRequiredResponse function

Browse Source
This commit is contained in:
shuaiplus
2026-03-02 22:12:46 +08:00
parent f59e81de3a
commit 16a7bcace9
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/identity.ts
-5
View File
@@ -31,13 +31,8 @@ function resolveTotpSecret(userSecret: string | null, envSecret: string | undefi
function twoFactorRequiredResponse(message: string = 'Two factor required.', includeRecoveryCode: boolean = false): Response { function twoFactorRequiredResponse(message: string = 'Two factor required.', includeRecoveryCode: boolean = false): Response {
const providers = includeRecoveryCode const providers = includeRecoveryCode
<<<<<<< HEAD
? [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR), TWO_FACTOR_PROVIDER_RECOVERY_CODE_RESPONSE] ? [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR), TWO_FACTOR_PROVIDER_RECOVERY_CODE_RESPONSE]
: [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR)]; : [String(TWO_FACTOR_PROVIDER_AUTHENTICATOR)];
=======
? [TWO_FACTOR_PROVIDER_AUTHENTICATOR, TWO_FACTOR_PROVIDER_RECOVERY_CODE]
: [TWO_FACTOR_PROVIDER_AUTHENTICATOR];
>>>>>>> 41221998c9142902c5f5be775ea5b4309742a640
const providers2: Record<string, null> = {}; const providers2: Record<string, null> = {};
for (const provider of providers) providers2[provider] = null; for (const provider of providers) providers2[provider] = null;