The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): org MFA enforcement toggle visibility and UX (DEPR-606) (#47285)
Danny Whiteef148b6504e3
diff --git a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx b/apps/studio/components/interfaces/Organization/SecuritySettings.tsxindex a8ea11d9644..cba6de2cbbc 100644--- a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx+++ b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx@@ -1,29 +1,18 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'+import Link from 'next/link'import { useEffect } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import {- Button,- Card,- CardContent,- CardFooter,- Form,- FormControl,- FormField,- Switch,- Tooltip,- TooltipContent,- TooltipTrigger,-} from 'ui'+import { Button, Card, CardContent, CardFooter, Form, FormControl, FormField, Switch } from 'ui'+import { Admonition } from 'ui-patterns'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { z } from 'zod'import { ScaffoldContainer, ScaffoldSection } from '@/components/layouts/Scaffold'import AlertError from '@/components/ui/AlertError'-import { InlineLink } from '@/components/ui/InlineLink'import NoPermission from '@/components/ui/NoPermission'import { UpgradeToPro } from '@/components/ui/UpgradeToPro'import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'@@ -41,7 +30,13 @@ const schema = z.object({export const SecuritySettings = () => {const { slug } = useParams()const { profile } = useProfile()- const { data: members } = useOrganizationMembersQuery({ slug })+ const {+ data: members,+ error: membersError,+ isPending: isLoadingMembers,+ isError: isMembersError,+ isSuccess: isSuccessMembers,+ } = useOrganizationMembersQuery({ slug })const { can: canReadMfaConfig, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(PermissionAction.READ,@@ -89,7 +84,19 @@ export const SecuritySettings = () => {}, [mfaConfig, form])const hasMFAEnabled =- members?.find((member) => member.primary_email == profile?.primary_email)?.mfa_enabled || false+ members?.find((member) => member.primary_email == profile?.primary_email)?.mfa_enabled ?? false++ const requiresPersonalMfa = isSuccessMembers && canUpdateMfaConfig && !hasMFAEnabled++ const isLoadingMfaEnforcementSettings =+ isLoadingMfa || isLoadingPermissions || isLoadingEntitlement || isLoadingMembers+ const hasMfaConfigError = (isErrorMfa || Boolean(mfaError)) && hasAccessToEnforceMfa+ const canShowMfaEnforcementForm =+ isSuccessMfa && hasAccessToEnforceMfa && isSuccessMembers && !requiresPersonalMfa+ const isMfaEnforcementSwitchDisabled =+ !hasAccessToEnforceMfa || !canUpdateMfaConfig || isUpdatingMfa+ const isSaveMfaEnforcementDisabled =+ isMfaEnforcementSwitchDisabled || isLoadingMfa || !form.formState.isDirtyconst onSubmit = (values: { enforceMfa: boolean }) => {if (!slug || !hasAccessToEnforceMfa) return@@ -108,7 +115,7 @@ export const SecuritySettings = () => {/>) : (<>- {isLoadingMfa || isLoadingPermissions || isLoadingEntitlement ? (+ {isLoadingMfaEnforcementSettings ? (<Card><CardContent><GenericSkeletonLoader />@@ -116,13 +123,31 @@ export const SecuritySettings = () => {</Card>) : !canReadMfaConfig ? (<NoPermission resourceText="view organization security settings" />- ) : null}+ ) : (+ requiresPersonalMfa && (+ <Admonition+ type="note"+ layout="horizontal"+ title="Enable MFA on your account first"+ description="You need to set up multi-factor authentication (MFA) on your own account before you can enforce it on your organization."+ actions={+ <Button asChild variant="default">+ <Link href="/account/security">Set up MFA</Link>+ </Button>+ }+ />+ )+ )}++ {isMembersError && (+ <AlertError error={membersError} subject="Failed to retrieve organization members" />+ )}- {(isErrorMfa || mfaError) && hasAccessToEnforceMfa && (+ {hasMfaConfigError && (<AlertError error={mfaError} subject="Failed to retrieve MFA enforcement status" />)}- {isSuccessMfa && hasAccessToEnforceMfa && (+ {canShowMfaEnforcementForm && (<Form {...form}><form onSubmit={form.handleSubmit(onSubmit)}><Card>@@ -133,36 +158,16 @@ export const SecuritySettings = () => {render={({ field }) => (<FormItemLayoutlayout="flex-row-reverse"+ className="justify-between"label="Require MFA to access organization"description="Team members must have MFA enabled and a valid MFA session to access the organization and any projects."><FormControl>- <Tooltip>- <TooltipTrigger asChild>- <Switch- checked={field.value}- onCheckedChange={field.onChange}- disabled={- !hasAccessToEnforceMfa ||- !canUpdateMfaConfig ||- !hasMFAEnabled ||- isUpdatingMfa- }- />- </TooltipTrigger>- {(!canUpdateMfaConfig || !hasMFAEnabled) && (- <TooltipContent side="bottom">- {!canUpdateMfaConfig ? (- "You don't have permission to update MFA settings"- ) : (- <>- <InlineLink href="/account/security">Enable MFA</InlineLink>{' '}- on your own account first- </>- )}- </TooltipContent>- )}- </Tooltip>+ <Switch+ checked={field.value}+ onCheckedChange={field.onChange}+ disabled={isMfaEnforcementSwitchDisabled}+ /></FormControl></FormItemLayout>)}@@ -183,16 +188,10 @@ export const SecuritySettings = () => {<Buttonvariant="primary"type="submit"- disabled={- !hasAccessToEnforceMfa ||- !canUpdateMfaConfig ||- isUpdatingMfa ||- isLoadingMfa ||- !form.formState.isDirty- }+ disabled={isSaveMfaEnforcementDisabled}loading={isUpdatingMfa}>- Save changes+ Save</Button></CardFooter></Card>