Skip to content

fix: TOTP の認証失敗で 500 Internal Server Error が返ってくる #17594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linze0721 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: TOTP の認証失敗で 500 Internal Server Error が返ってくる #17594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e582826
fix(backend): return client error for invalid TOTP in passkey setup
Jun 20, 2026
838527a
Merge branch 'develop' into fix/eb592826-a9ba-48d8-b167-5c98436fa021
linze0721 Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ export const meta = {
id: '0d7ec6d2-e652-443e-a7bf-9ee9a0cd77b0',
},

incorrectTotp: {
message: 'The one-time password is incorrect or has expired.',
code: 'INCORRECT_TOTP',
id: '57e56c36-e07e-49ab-97fb-7dc8a5b4cd50',
},

twoFactorNotEnabled: {
message: '2fa not enabled.',
code: 'TWO_FACTOR_NOT_ENABLED',
Expand Down Expand Up @@ -76,13 +82,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {

if (profile.twoFactorEnabled) {
if (token == null) {
throw new Error('authentication failed');
throw new ApiError(meta.errors.incorrectTotp);
}

try {
await this.userAuthService.twoFactorAuthenticate(profile, token);
} catch (_) {
throw new Error('authentication failed');
throw new ApiError(meta.errors.incorrectTotp);
}
}

Expand Down
10 changes: 8 additions & 2 deletions packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ export const meta = {
id: '38769596-efe2-4faf-9bec-abbb3f2cd9ba',
},

incorrectTotp: {
message: 'The one-time password is incorrect or has expired.',
code: 'INCORRECT_TOTP',
id: '0606da0a-a3c3-4215-8b87-30ecb63475c1',
},

twoFactorNotEnabled: {
message: '2fa not enabled.',
code: 'TWO_FACTOR_NOT_ENABLED',
Expand Down Expand Up @@ -76,13 +82,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {

if (profile.twoFactorEnabled) {
if (token == null) {
throw new Error('authentication failed');
throw new ApiError(meta.errors.incorrectTotp);
}

try {
await this.userAuthService.twoFactorAuthenticate(profile, token);
} catch (_) {
throw new Error('authentication failed');
throw new ApiError(meta.errors.incorrectTotp);
}
}

Expand Down
Loading