Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(account): stop sb marker leaking into email toast (#47455)

Pamela Chia0099ad1aecd3
diff --git a/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.tsx b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.tsx
index 2307ecc7206..2456d57068d 100644
--- a/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.tsx
+++ b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.tsx
@@ -29,6 +29,7 @@ import {
} from 'ui-patterns/PageSection'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
+import { parseRedirectMessage } from './AccountIdentities.utils'
import {
ChangeEmailAddressForm,
GitHubChangeEmailAddress,
@@ -68,7 +69,7 @@ export const AccountIdentities = () => {
const [selectedProviderUpdateEmail, setSelectedProviderUpdateEmail] = useState<string>()
const [linkingProviderId, setLinkingProviderId] = useState<string>()
- const [, message] = router.asPath.split('#message=')
+ const message = parseRedirectMessage(router.asPath)
const unlinkedExternalProviders = connectableExternalProviders.filter((provider) => {
return !identities.some(
(identity) => identity.provider === provider.authProvider || identity.provider === provider.id
@@ -119,7 +120,7 @@ export const AccountIdentities = () => {
}
useEffect(() => {
- if (message) toast.success(message.replaceAll('+', ' '))
+ if (message) toast.success(message)
}, [message])
return (
diff --git a/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.test.ts b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.test.ts
new file mode 100644
index 00000000000..fffe0612f40
--- /dev/null
+++ b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+
+import { parseRedirectMessage } from './AccountIdentities.utils'
+
+describe('parseRedirectMessage', () => {
+ it('drops the trailing sb marker and decodes + as spaces', () => {
+ expect(
+ parseRedirectMessage(
+ '/account/me#message=Confirmation+link+accepted.+Please+proceed+to+confirm+link+sent+to+the+other+email&sb='
+ )
+ ).toBe('Confirmation link accepted. Please proceed to confirm link sent to the other email')
+ })
+
+ it('returns undefined when there is no hash', () => {
+ expect(parseRedirectMessage('/account/me')).toBeUndefined()
+ })
+
+ it('returns undefined when the fragment has no message key', () => {
+ expect(parseRedirectMessage('/account/me#sb=')).toBeUndefined()
+ })
+
+ it('finds message even when it is not the first fragment param', () => {
+ expect(parseRedirectMessage('/account/me#sb=&message=Hi+there')).toBe('Hi there')
+ })
+
+ it('preserves a literal + via percent-encoding', () => {
+ expect(parseRedirectMessage('/account/me#message=a%2Bb&sb=')).toBe('a+b')
+ })
+})
diff --git a/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.ts b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.ts
new file mode 100644
index 00000000000..842c102db1c
--- /dev/null
+++ b/apps/studio/components/interfaces/Account/Preferences/AccountIdentities.utils.ts
@@ -0,0 +1,2 @@
+export const parseRedirectMessage = (asPath: string) =>
+ new URLSearchParams(asPath.split('#')[1] ?? '').get('message') ?? undefined