The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Recovery codes: fix condition to display them (#50716)
Gildas Garcia314856558b41
diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsxindex 2b18106f3ed..bbc79658cae 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx@@ -36,7 +36,12 @@ export const AddNewFactorModal = ({ visible, onClose }: AddNewFactorModalProps)enabled: enableAuthRecoveryCodes,})- const recoveryCodesGenerateMutation = useRecoveryCodesGenerateMutation()+ const recoveryCodesGenerateMutation = useRecoveryCodesGenerateMutation({+ onSettled: () => {+ onClose()+ setIsRecoveryCodesModalOpen(true)+ },+ })const [isRecoveryCodesModalOpen, setIsRecoveryCodesModalOpen] = useState<boolean>(false)@@ -57,7 +62,11 @@ export const AddNewFactorModal = ({ visible, onClose }: AddNewFactorModalProps)visible={visible && Boolean(data)}factorName={data?.friendly_name ?? ''}factor={data as Extract<typeof data, { type: 'totp' }>}- isLoading={isEnrolling || (enableAuthRecoveryCodes && isRecoveryCodesStatusPending)}+ isLoading={+ isEnrolling ||+ (enableAuthRecoveryCodes &&+ (isRecoveryCodesStatusPending || recoveryCodesGenerateMutation.isPending))+ }onClose={async () => {if (enableAuthRecoveryCodes) {const { data: currentRecoveryCodesStatus } = await refetchRecoveryCodesStatus()@@ -65,7 +74,7 @@ export const AddNewFactorModal = ({ visible, onClose }: AddNewFactorModalProps)if (shouldGenerateRecoveryCodes) {recoveryCodesGenerateMutation.mutate({})- setIsRecoveryCodesModalOpen(true)+ return}}onClose()@@ -223,7 +232,7 @@ const SecondStep = ({title={`Verify new factor ${factorName}`}confirmLabel="Confirm"confirmLabelLoading="Confirming"- loading={isVerifying}+ loading={isVerifying || isLoading}onCancel={() => {// If a factor has been created (but not verified), unenroll it. This will be run as a// side effect so that it's not confusing to the user why the modal stays open whilediff --git a/apps/studio/components/interfaces/Account/TOTPFactors/GenerateRecoveryCodesModal.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/GenerateRecoveryCodesModal.tsxindex 93f2a69f594..f80a8683186 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/GenerateRecoveryCodesModal.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/GenerateRecoveryCodesModal.tsx@@ -6,7 +6,9 @@ import { RecoveryCodesModal } from './RecoveryCodesModal'import { useRecoveryCodesGenerateMutation } from '@/data/recovery-codes/recovery-codes-generate-mutation'export const GenerateRecoveryCodesModal = () => {- const recoveryCodesGenerateMutation = useRecoveryCodesGenerateMutation()+ const recoveryCodesGenerateMutation = useRecoveryCodesGenerateMutation({+ onSettled: () => setOpen(true),+ })const [open, setOpen] = useState(false)return (@@ -17,11 +19,14 @@ export const GenerateRecoveryCodesModal = () => {description="Recovery codes are important to ensure you can recover your account if you loose access to your MFA."actions={<>+ <span aria-live="polite" className="sr-only">+ {recoveryCodesGenerateMutation.isPending ? 'Generating your recovery codes...' : ''}+ </span><ButtononClick={() => {- setOpen(true)recoveryCodesGenerateMutation.mutate({})}}+ loading={recoveryCodesGenerateMutation.isPending}>Generate recovery codes</Button>diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/RegenerateRecoveryCodesModal.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/RegenerateRecoveryCodesModal.tsxindex 237442446d5..68d034c204e 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/RegenerateRecoveryCodesModal.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/RegenerateRecoveryCodesModal.tsx@@ -9,7 +9,12 @@ export const RegenerateRecoveryCodesModal = () => {const [showConfirm, setShowConfirm] = useState(false)const [open, setOpen] = useState(false)- const recoveryCodesRegenerateMutation = useRecoveryCodesRegenerateMutation()+ const recoveryCodesRegenerateMutation = useRecoveryCodesRegenerateMutation({+ onSettled: () => {+ setShowConfirm(false)+ setOpen(true)+ },+ })return (<>@@ -24,8 +29,6 @@ export const RegenerateRecoveryCodesModal = () => {confirmLabel="Regenerate"loading={recoveryCodesRegenerateMutation.isPending}onConfirm={() => {- setShowConfirm(false)- setOpen(true)recoveryCodesRegenerateMutation.mutate()}}onCancel={() => setShowConfirm(false)}diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsxindex 5bf6bba9cb1..801e14635d1 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx@@ -34,7 +34,7 @@ export const TOTPFactors = () => {const totpFactors = data?.totp ?? []const canAddApp = isSuccess && totpFactors.length < 2const shouldShowLockoutWarning = isSuccess && totpFactors.length === 1- const shouldVerifyRecoveryCodes = enableAuthRecoveryCodes+ const shouldVerifyRecoveryCodes = enableAuthRecoveryCodes && totpFactors.length > 0const { data: recoveryCodesStatus } = useRecoveryCodesStatusQuery({enabled: shouldVerifyRecoveryCodes,