mirror of
https://github.com/supabase/supabase.git
synced 2026-10-14 21:59:16 +03:00
* Update the design of the sonner toasts. Add the close button by default. * Migrate studio and www apps to use the SonnerToaster. * Migrate all toasts from studio. * Migrate all leftover toasts in studio. * Add a new toast component with progress. Use it in studio. * Migrate the design-system app. * Refactor the consent toast to use sonner. * Switch docs to use the new sonner toasts. * Remove toast examples from the design-system app. * Remove all toast-related components and old code. * Fix the progress bar in the toast progress component. Also make the bottom components vertically centered. * Fix the width of the toast progress. * Use text-foreground-lighter instead of muted for ToastProgress text * Rename ToastProgress to SonnerProgress. * Shorten the text in sonner progress. * Use the correct classes for the close button. Add a const var for the default toast duration. Remove the custom width class from sonner. * Set the position for all progress toasts to bottom right. Set the duration for all toasts to the default (when reusing a toast id from loading/progress toast, the duration is set to infinity). * Fix the playwright tests. * Refactor imports to use ui instead of @ui. * Change all imports of react-hot-toast with sonner. These components were merged since the last commit to this branch. * Remove react-hot-toast lib. --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Jonathan Summers-Muir <MildTomato@users.noreply.github.com>
65 lines
2.1 KiB
TypeScript
65 lines
2.1 KiB
TypeScript
import * as Sentry from '@sentry/nextjs'
|
|
import type { AuthMFAVerifyResponse, MFAChallengeAndVerifyParams } from '@supabase/supabase-js'
|
|
import { UseMutationOptions, useMutation, useQueryClient } from '@tanstack/react-query'
|
|
import { toast } from 'sonner'
|
|
|
|
import { auth } from 'lib/gotrue'
|
|
import { profileKeys } from './keys'
|
|
|
|
const WHITELIST_ERRORS = ['Invalid TOTP code entered']
|
|
|
|
interface MFAChallengeAndVerifyVariables extends MFAChallengeAndVerifyParams {
|
|
refreshFactors?: boolean
|
|
}
|
|
|
|
export const mfaChallengeAndVerify = async (params: MFAChallengeAndVerifyParams) => {
|
|
const { error, data } = await auth.mfa.challengeAndVerify(params)
|
|
if (error) throw error
|
|
return data
|
|
}
|
|
|
|
type CustomMFAVerifyResponse = NonNullable<AuthMFAVerifyResponse['data']>
|
|
type CustomMFAVerifyError = NonNullable<AuthMFAVerifyResponse['error']>
|
|
|
|
export const useMfaChallengeAndVerifyMutation = ({
|
|
onSuccess,
|
|
onError,
|
|
...options
|
|
}: Omit<
|
|
UseMutationOptions<CustomMFAVerifyResponse, CustomMFAVerifyError, MFAChallengeAndVerifyVariables>,
|
|
'mutationFn'
|
|
> = {}) => {
|
|
const queryClient = useQueryClient()
|
|
|
|
return useMutation(
|
|
(vars) => {
|
|
const { refreshFactors, ...params } = vars
|
|
return mfaChallengeAndVerify(params)
|
|
},
|
|
{
|
|
async onSuccess(data, variables, context) {
|
|
// when a MFA is added, the aaLevel is bumped up
|
|
const refreshFactors = variables.refreshFactors ?? true
|
|
|
|
await Promise.all([
|
|
...(refreshFactors ? [queryClient.invalidateQueries(profileKeys.mfaFactors())] : []),
|
|
queryClient.invalidateQueries(profileKeys.aaLevel()),
|
|
])
|
|
|
|
await onSuccess?.(data, variables, context)
|
|
},
|
|
async onError(data, variables, context) {
|
|
if (onError === undefined) {
|
|
toast.error(`Failed to sign in: ${data.message}`)
|
|
} else {
|
|
onError(data, variables, context)
|
|
}
|
|
if (!WHITELIST_ERRORS.some((error) => data.message.includes(error))) {
|
|
Sentry.captureMessage('[CRITICAL] Failed to sign in via MFA: ' + data.message)
|
|
}
|
|
},
|
|
...options,
|
|
}
|
|
)
|
|
}
|