Files
Danny White 476d4a5851 refactor(ui): drop redundant Button variant="default" props (#50161)
## What kind of change does this PR introduce?

Mechanical cleanup on top of the Button default-variant change (#50160).

## What is the current behavior?

Many callsites still pass `variant="default"` even though that is now
the component default.

## What is the new behavior?

Removes redundant static `variant="default"` from legacy `Button` and
`ButtonTooltip` callsites. Keeps explicit defaults where they document
the API:

- `button-default.tsx` and `button-sizes.tsx` demos
- `DocsButton`, which pins neutral styling at the wrapper boundary

## To test

Studio:

- [Auth → Rate
Limits](https://studio-staging-2s957kwc4-supabase.vercel.app/dashboard/project/_/auth/rate-limits):
dirty the form so Cancel appears; Cancel stays neutral, Save stays green
- [Project Settings → API
Keys](https://studio-staging-2s957kwc4-supabase.vercel.app/dashboard/project/_/settings/api-keys):
`DocsButton` in the header actions stays neutral

Design system:

- [Design system →
Button](https://design-system-git-dnywh-dc924ac1-supabase.vercel.app/design-system/docs/components/button):
`button-default` / `button-sizes` still show explicit default styling;
Primary (green) is restricted to the Primary section (and `asChild`)

WWW:

- [www → Brand
assets](https://zone-www-dot-com-git-dnywh-dc924ac1-supabase.vercel.app/brand-assets):
Download logo kit / Download button kit stay neutral
2026-09-11 17:05:26 +10:00

286 lines
11 KiB
TypeScript

import type { Provider } from '@supabase/auth-js'
import { useFlag } from 'common'
import dayjs from 'dayjs'
import { Edit, Unlink } from 'lucide-react'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { useEffect, useMemo, useState } from 'react'
import { toast } from 'sonner'
import {
Badge,
Button,
Card,
CardContent,
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
Tooltip,
TooltipContent,
TooltipTrigger,
} from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import {
PageSection,
PageSectionContent,
PageSectionDescription,
PageSectionMeta,
PageSectionSummary,
PageSectionTitle,
} from 'ui-patterns/PageSection'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import { parseRedirectMessage, shouldShowAddPasswordRow } from './AccountIdentities.utils'
import { AddPasswordRow } from './AddPasswordRow'
import {
ChangeEmailAddressForm,
GitHubChangeEmailAddress,
SSOChangeEmailAddress,
} from './ChangeEmailAddress'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { IdentityProviderIcon } from '@/components/ui/ProviderIcon'
import { useProfileIdentitiesQuery } from '@/data/profile/profile-identities-query'
import { useUnlinkIdentityMutation } from '@/data/profile/profile-unlink-identity-mutation'
import { useEnabledIdentityProviders } from '@/hooks/misc/useEnabledIdentityProviders'
import { captureCriticalError } from '@/lib/error-reporting'
import {
buildProviderAuthRedirect,
getProviderDisplay,
type ExternalIdentityProviderConfig,
} from '@/lib/external-identity-providers'
import { getErrorMessage } from '@/lib/get-error-message'
import { auth, buildPathWithParams } from '@/lib/gotrue'
export const AccountIdentities = () => {
const router = useRouter()
const { data, isPending: isLoading, isSuccess } = useProfileIdentitiesQuery()
const enabledProviders = useEnabledIdentityProviders()
const connectableExternalProviders = useMemo(
() => enabledProviders.filter((provider) => provider.showInAccountPreferences),
[enabledProviders]
)
const isAddAccountPasswordEnabled = useFlag('enableAccountPassword')
const identities = data?.identities ?? []
const showAddPasswordRow =
isAddAccountPasswordEnabled && shouldShowAddPasswordRow({ identities, email: data?.email })
const isChangeExpired = data?.email_change_sent_at
? dayjs().utc().diff(dayjs(data?.email_change_sent_at).utc(), 'minute') > 10
: false
const [selectedProviderUnlink, setSelectedProviderUnlink] = useState<string>()
const [selectedProviderUpdateEmail, setSelectedProviderUpdateEmail] = useState<string>()
const [linkingProviderId, setLinkingProviderId] = useState<string>()
const message = parseRedirectMessage(router.asPath)
const unlinkedExternalProviders = connectableExternalProviders.filter((provider) => {
return !identities.some(
(identity) => identity.provider === provider.authProvider || identity.provider === provider.id
)
})
const { mutate: unlinkIdentity, isPending: isUnlinking } = useUnlinkIdentityMutation({
onSuccess: () => {
toast.success(`Successfully unlinked ${getProviderName(selectedProviderUnlink)} identity!`)
setSelectedProviderUnlink(undefined)
},
})
const getProviderName = (provider?: string) =>
provider ? getProviderDisplay(provider).displayName : undefined
const getConfiguredExternalProvider = (provider: string) =>
connectableExternalProviders.find(
({ id, authProvider }) => provider === id || provider === authProvider
)
const onConfirmUnlinkIdentity = async () => {
const identity = identities.find((i) => i.provider === selectedProviderUnlink)
if (identity) unlinkIdentity(identity)
}
const onLinkExternalProvider = async (provider: ExternalIdentityProviderConfig) => {
setLinkingProviderId(provider.id)
try {
const redirectTo = buildPathWithParams(buildProviderAuthRedirect(provider.id, '/account/me'))
const { error } = await auth.linkIdentity({
provider: provider.authProvider as Provider,
options: { redirectTo, scopes: provider.scopes },
})
if (error) throw error
} catch (error: unknown) {
const message = getErrorMessage(error) ?? 'Unknown error'
toast.error(`Failed to link ${provider.displayName} identity: ${message}`)
captureCriticalError(
error instanceof Error ? error : new Error(message),
`link ${provider.displayName} identity`
)
setLinkingProviderId(undefined)
}
}
useEffect(() => {
if (message) toast.success(message)
}, [message])
return (
<PageSection>
<PageSectionMeta>
<PageSectionSummary>
<PageSectionTitle>Sign-in methods</PageSectionTitle>
<PageSectionDescription>
Manage the providers linked to your Supabase account and update their details.
</PageSectionDescription>
</PageSectionSummary>
</PageSectionMeta>
<PageSectionContent>
<Card>
{isLoading && (
<CardContent>
<ShimmeringLoader />
</CardContent>
)}
{isSuccess && (
<div className="divide-y">
{showAddPasswordRow && !!data.email && <AddPasswordRow email={data.email} />}
{identities.map((identity) => {
const { identity_id, provider } = identity
const username = identity.identity_data?.user_name
const providerDisplay = getProviderDisplay(provider)
const providerName = providerDisplay.displayName
const configuredProvider = getConfiguredExternalProvider(provider)
const canUpdateEmail = !configuredProvider
return (
<CardContent key={identity_id} className="flex justify-between items-center py-4">
<div className="flex gap-x-4">
<IdentityProviderIcon display={providerDisplay} size={30} />
<div>
<div className="flex items-center gap-x-2">
<p className="text-sm capitalize">{providerName}</p>
{provider === 'email' && data.new_email && !isChangeExpired && (
<Tooltip>
<TooltipTrigger className="flex items-center">
<Badge variant="default">Pending change</Badge>
</TooltipTrigger>
<TooltipContent>Changing to {data.new_email}</TooltipContent>
</Tooltip>
)}
</div>
<p className="text-sm text-foreground-lighter">
{!!username ? <span>{username} · </span> : null}
{identity.email}
</p>
</div>
</div>
<div className="flex items-center gap-x-1">
{provider === 'email' && (
<Button asChild>
<Link href="/reset-password?type=change">Change password</Link>
</Button>
)}
{canUpdateEmail && (
<ButtonTooltip
variant="text"
icon={<Edit />}
className="w-7"
onClick={() => setSelectedProviderUpdateEmail(provider)}
tooltip={{ content: { side: 'bottom', text: 'Update email address' } }}
/>
)}
{identities.length > 1 && (
<ButtonTooltip
variant="text"
icon={<Unlink />}
className="w-7"
onClick={() => setSelectedProviderUnlink(provider)}
tooltip={{ content: { side: 'bottom', text: 'Unlink identity' } }}
/>
)}
</div>
</CardContent>
)
})}
{unlinkedExternalProviders.map((provider) => {
const providerDisplay = getProviderDisplay(provider.authProvider)
return (
<CardContent key={provider.id} className="flex justify-between items-center py-4">
<div className="flex gap-x-4">
<IdentityProviderIcon display={providerDisplay} size={30} />
<div>
<p className="text-sm">{provider.displayName}</p>
<p className="text-sm text-foreground-lighter">
Link your {provider.displayName} account to sign in with{' '}
{provider.displayName}
</p>
</div>
</div>
<Button
loading={linkingProviderId === provider.id}
disabled={!!linkingProviderId}
onClick={() => onLinkExternalProvider(provider)}
>
Connect
</Button>
</CardContent>
)
})}
</div>
)}
</Card>
<Dialog
open={!!selectedProviderUpdateEmail}
onOpenChange={(open: boolean) => {
if (!open) setSelectedProviderUpdateEmail(undefined)
}}
>
<DialogContent>
<DialogHeader className="border-b">
<DialogTitle>
{selectedProviderUpdateEmail !== 'email'
? `Updating email address for ${getProviderName(selectedProviderUpdateEmail)} identity`
: 'Update email address'}
</DialogTitle>
</DialogHeader>
{selectedProviderUpdateEmail === 'github' ? (
<GitHubChangeEmailAddress />
) : selectedProviderUpdateEmail?.startsWith('sso') ? (
<SSOChangeEmailAddress />
) : (
<ChangeEmailAddressForm onClose={() => setSelectedProviderUpdateEmail(undefined)} />
)}
</DialogContent>
</Dialog>
<ConfirmationModal
variant="warning"
size="small"
loading={isUnlinking}
visible={!!selectedProviderUnlink}
title={`Unlink ${getProviderName(selectedProviderUnlink)} identity`}
onCancel={() => setSelectedProviderUnlink(undefined)}
onConfirm={onConfirmUnlinkIdentity}
confirmLabel="Unlink identity"
confirmLabelLoading="Unlinking identity"
alert={{
base: { variant: 'warning' },
title: `Confirm to disconnect your ${getProviderName(selectedProviderUnlink)} identity`,
description:
'After disconnecting, you will only be able to sign in with your remaining identities.',
}}
/>
</PageSectionContent>
</PageSection>
)
}