match app-password errors on the typed lex error, not raw message equality
isErrorMaybeAppPasswordPermissions compared getErrorName against
'TokenInvalid', a code the PDS never sends - the string fallback was
doing all the work. The real wire shape is the GENERIC 'InvalidToken'
code (also used for malformed/expired tokens) with the app-password
specifics only in the message, so the typed path now matches code AND
message ('Bad token scope' / 'Bad token method').
Deactivated and DeactivateAccountDialog used raw switch(e.message)
equality; both now go through the helper. Tests updated to pin the
actual PDS wire shape (and reject plain malformed-token errors).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -4,6 +4,7 @@ import {msg} from '@lingui/core/macro'
|
||||
import {useLingui} from '@lingui/react'
|
||||
import {Trans} from '@lingui/react/macro'
|
||||
|
||||
import {isErrorMaybeAppPasswordPermissions} from '#/lib/strings/errors'
|
||||
import {logger} from '#/logger'
|
||||
import {usePdsClient, useSessionApi} from '#/state/session'
|
||||
import {atoms as a, useTheme} from '#/alf'
|
||||
@@ -48,17 +49,14 @@ function DeactivateAccountDialogInner({
|
||||
logoutCurrentAccount('Deactivated')
|
||||
})
|
||||
} catch (e: any) {
|
||||
switch (e.message) {
|
||||
case 'Bad token scope':
|
||||
setError(
|
||||
_(
|
||||
msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
|
||||
),
|
||||
)
|
||||
break
|
||||
default:
|
||||
setError(_(msg`Something went wrong, please try again`))
|
||||
break
|
||||
if (isErrorMaybeAppPasswordPermissions(e)) {
|
||||
setError(
|
||||
_(
|
||||
msg`You're signed in with an App Password. Please sign in with your main password to continue deactivating your account.`,
|
||||
),
|
||||
)
|
||||
} else {
|
||||
setError(_(msg`Something went wrong, please try again`))
|
||||
}
|
||||
|
||||
logger.error(e, {
|
||||
|
||||
Reference in New Issue
Block a user