mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03:00
Joshen Lim
fd0f2dd459
## Context If a user switches account without an explicit log out via the dashboard, landing back on `/org` will redirect users to the last visited organization as stored in local storage, in which it can result in the following state if the last visited organization does not exist in the current account <img width="2538" height="1060" alt="image" src="https://github.com/user-attachments/assets/270e482a-3515-48ef-898b-87e76fce80d6" /> ## Changes involved Am opting to scope the last visited organization to the user profile instead - this would be a bit more cleaner than trying to actively clear the last visited org slug from local storage with implicit account changes as there's no deterministic way to track that (afaik) from FE side of things ## To test Can reproduce the problem as such - Ensure that you have 2 accounts to log in with, and one account has an org that the other is not a part of - For the organization that has the "extra" org, ensure that you click into it so that the last visited org slug is saved in local storage - Mimic changing accounts by visiting `/auth/v1/authorize?provider=github` (using the domain for the env that you're testing on - e.g localhost:8000 for local, or green for staging preview) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Unified “last visited organization” handling across the Studio UI with a shared hook, improving consistency for home/dashboard return, cancel/back navigation, and account routing. * **Bug Fixes** * Updated redirects to only route to an organization when a valid last-visited value is available; otherwise users go to the general organizations page. * Kept MFA enrollment and factor delete/leave flows aligned to the unified last-visited organization value. * **Tests** * Updated onboarding and layout tests to match the new last-visited organization storage key format and hook/query success behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
77 lines
2.5 KiB
TypeScript
77 lines
2.5 KiB
TypeScript
import { NextPage } from 'next'
|
|
import { useTheme } from 'next-themes'
|
|
import Image from 'next/legacy/image'
|
|
import Link from 'next/link'
|
|
import { useRouter } from 'next/router'
|
|
import { Button } from 'ui'
|
|
|
|
import { SupportLink } from '@/components/interfaces/Support/SupportLink'
|
|
import { useLastVisitedOrganization } from '@/hooks/misc/useLastVisitedOrganization'
|
|
import { useSignOut } from '@/lib/auth'
|
|
|
|
const Error500: NextPage = () => {
|
|
const router = useRouter()
|
|
const signOut = useSignOut()
|
|
const { resolvedTheme } = useTheme()
|
|
|
|
const { lastVisitedOrganization } = useLastVisitedOrganization()
|
|
|
|
const onClickLogout = async () => {
|
|
await signOut()
|
|
await router.push('/sign-in')
|
|
router.reload()
|
|
}
|
|
|
|
return (
|
|
<div className="relative mx-auto flex flex-1 w-full flex-col items-center justify-center space-y-6">
|
|
<div className="absolute top-0 mx-auto w-full max-w-7xl px-8 pt-6 sm:px-6 lg:px-8">
|
|
<nav className="relative flex items-center justify-between sm:h-10">
|
|
<div className="flex shrink-0 grow items-center lg:grow-0">
|
|
<div className="flex w-full items-center justify-between md:w-auto">
|
|
<Link href="/projects">
|
|
<Image
|
|
src={
|
|
resolvedTheme?.includes('dark')
|
|
? `${router.basePath}/img/supabase-dark.svg`
|
|
: `${router.basePath}/img/supabase-light.svg`
|
|
}
|
|
alt=""
|
|
height={24}
|
|
width={120}
|
|
/>
|
|
</Link>
|
|
</div>
|
|
</div>
|
|
</nav>
|
|
</div>
|
|
<div className="flex w-[320px] flex-col items-center justify-center space-y-3">
|
|
<h4 className="text-lg">Something went wrong 🤕</h4>
|
|
<p className="text-center">
|
|
Sorry about that, please try again later or feel free to reach out to us if the problem
|
|
persists.
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center space-x-4">
|
|
{router.pathname !== '/organizations' ? (
|
|
<Button asChild>
|
|
<Link
|
|
href={
|
|
!!lastVisitedOrganization ? `/org/${lastVisitedOrganization}` : '/organizations'
|
|
}
|
|
>
|
|
Head back
|
|
</Link>
|
|
</Button>
|
|
) : (
|
|
<Button onClick={onClickLogout}>Head back</Button>
|
|
)}
|
|
<Button variant="secondary" asChild>
|
|
<SupportLink>Submit a support request</SupportLink>
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
export default Error500
|