mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03:00
## Summary
The email-change confirmation toast rendered a trailing `&sb=` ("...sent
to the other email&sb="). The dashboard parsed the auth-redirect URL
fragment with a naive `split('#message=')` that grabbed everything after
the key, including the empty `sb` origin marker the auth service appends
to every redirect fragment (an intentional, server-side Supabase-Auth
identifier so clients can tell a Supabase redirect from a third-party
OAuth one). The marker is working as designed; the bug is that the
dashboard wasn't parsing the fragment as URL params, so I fixed the
parse rather than the marker.
## Changes
- Parse the redirect fragment with `URLSearchParams` via a new
`parseRedirectMessage` helper, reading only the `message` key. Any other
trailing fragment param (the `sb` marker, or future ones) is now ignored
instead of being concatenated into the toast.
- Drop the manual `+`-to-space replacement. `URLSearchParams.get()`
already decodes form-encoded values, and the old `.replaceAll('+', ' ')`
would have clobbered a legitimately encoded `+`.
- Add unit tests for the helper: marker stripped, no hash, no `message`
key, `message` not first, and percent-encoded `+` preserved.
## Testing (Vercel preview)
The toast only reads the URL fragment, so the redirect can be simulated
directly. Do not use the real email round-trip on the preview: a real
confirm-link click is redirected to prod (the backend sets
`redirect_to`), not the preview build.
- [x] On the preview, log in and open the account preferences page with
this fragment appended:
`/account/me#message=Confirmation+link+accepted.+Please+proceed+to+confirm+link+sent+to+the+other+email&sb=`
— toast shows the clean sentence with no `&sb=`.
- [x] Open the same page with no fragment — no toast fires.
## Linear
- fixes GROWTH-938
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Improved how success messages are read after redirect in account
identity preferences, so notifications now display the correct text more
reliably.
* Supported messages with spaces and special characters, including cases
where the message appears later in the URL fragment.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
279 lines
11 KiB
TypeScript
279 lines
11 KiB
TypeScript
import type { Provider } from '@supabase/auth-js'
|
|
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 } from './AccountIdentities.utils'
|
|
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 identities = data?.identities ?? []
|
|
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>Account identities</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">
|
|
{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 variant="default">
|
|
<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
|
|
variant="default"
|
|
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>
|
|
)
|
|
}
|