mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 10:25:06 +03:00
## 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 -->
140 lines
5.3 KiB
TypeScript
140 lines
5.3 KiB
TypeScript
import { useParams } from 'common'
|
|
import { useRouter } from 'next/router'
|
|
import { useState } from 'react'
|
|
import { toast } from 'sonner'
|
|
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
|
|
|
|
import { hasMultipleOwners } from './TeamSettings.utils'
|
|
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
|
|
import { useOrganizationRolesV2Query } from '@/data/organization-members/organization-roles-query'
|
|
import { useOrganizationMemberDeleteMutation } from '@/data/organizations/organization-member-delete-mutation'
|
|
import { useOrganizationMembersQuery } from '@/data/organizations/organization-members-query'
|
|
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
|
|
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
|
|
import { useLastVisitedOrganization } from '@/hooks/misc/useLastVisitedOrganization'
|
|
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
|
|
import { useProfile } from '@/lib/profile'
|
|
|
|
export const LeaveTeamButton = () => {
|
|
const router = useRouter()
|
|
const { slug } = useParams()
|
|
const { profile } = useProfile()
|
|
const { data: selectedOrganization } = useSelectedOrganizationQuery()
|
|
const { setLastVisitedOrganization } = useLastVisitedOrganization()
|
|
|
|
// if organizationMembersDeletionEnabled is false, you also can't delete yourself
|
|
const { organizationMembersDelete: organizationMembersDeletionEnabled } = useIsFeatureEnabled([
|
|
'organization_members:delete',
|
|
])
|
|
|
|
const [isLeaving, setIsLeaving] = useState(false)
|
|
const [isLeaveTeamModalOpen, setIsLeaveTeamModalOpen] = useState(false)
|
|
|
|
const { refetch: refetchOrganizations } = useOrganizationsQuery()
|
|
const { data: members } = useOrganizationMembersQuery({ slug })
|
|
const { data: allRoles } = useOrganizationRolesV2Query({ slug })
|
|
|
|
const roles = allRoles?.org_scoped_roles ?? []
|
|
const currentUserMember = members?.find((member) => member.gotrue_id === profile?.gotrue_id)
|
|
const currentUserRoleId = currentUserMember?.role_ids?.[0]
|
|
const currentUserRole = roles.find((role) => role.id === currentUserRoleId)
|
|
const isAdmin = currentUserRole?.name === 'Administrator'
|
|
const isOwner = selectedOrganization?.is_owner
|
|
|
|
const canLeave = !isOwner || (isOwner && hasMultipleOwners(members, roles))
|
|
|
|
const { mutate: deleteMember } = useOrganizationMemberDeleteMutation({
|
|
onSuccess: async () => {
|
|
setIsLeaving(false)
|
|
setIsLeaveTeamModalOpen(false)
|
|
|
|
await refetchOrganizations()
|
|
toast.success(`Successfully left ${selectedOrganization?.name}`)
|
|
|
|
setLastVisitedOrganization('')
|
|
router.push('/organizations')
|
|
},
|
|
onError: (error) => {
|
|
setIsLeaving(false)
|
|
toast.error(`Failed to leave organization: ${error?.message}`)
|
|
},
|
|
})
|
|
|
|
const leaveTeam = async () => {
|
|
if (!slug) return console.error('Org slug is required')
|
|
if (!profile) return console.error('Profile is required')
|
|
|
|
setIsLeaving(true)
|
|
deleteMember({ slug, gotrueId: profile.gotrue_id })
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<ButtonTooltip
|
|
variant="default"
|
|
disabled={!canLeave || !organizationMembersDeletionEnabled || isLeaving}
|
|
onClick={() => setIsLeaveTeamModalOpen(true)}
|
|
tooltip={{
|
|
content: {
|
|
side: 'bottom',
|
|
text: !canLeave
|
|
? 'An organization requires at least 1 owner'
|
|
: !organizationMembersDeletionEnabled
|
|
? 'Unable to leave organization'
|
|
: undefined,
|
|
},
|
|
}}
|
|
>
|
|
Leave team
|
|
</ButtonTooltip>
|
|
<ConfirmationModal
|
|
size="medium"
|
|
visible={isLeaveTeamModalOpen}
|
|
title="Confirm to leave organization"
|
|
confirmLabel="Leave"
|
|
variant="warning"
|
|
alert={{
|
|
title: 'All of your user content will be permanently removed.',
|
|
description: (
|
|
<div>
|
|
<p>
|
|
Leaving the organization will delete all of your saved content in the projects of
|
|
the organization, which includes:
|
|
</p>
|
|
<ul className="list-disc pl-4">
|
|
<li>
|
|
SQL snippets <span className="text-foreground">(both private and shared)</span>
|
|
</li>
|
|
<li>Custom reports</li>
|
|
<li>Log Explorer queries</li>
|
|
</ul>
|
|
{(isOwner || isAdmin) && (
|
|
<div className="mt-2">
|
|
<p>
|
|
<span className="text-foreground">
|
|
Leaving won't remove your payment method or stop payments.
|
|
</span>
|
|
</p>
|
|
<ul className="list-disc pl-4">
|
|
<li>
|
|
The current payment method will remain active and may still be charged after
|
|
you leave.
|
|
</li>
|
|
<li>The billing address will remain unchanged.</li>
|
|
</ul>
|
|
</div>
|
|
)}
|
|
</div>
|
|
),
|
|
}}
|
|
onCancel={() => setIsLeaveTeamModalOpen(false)}
|
|
onConfirm={() => leaveTeam()}
|
|
>
|
|
<p className="text-sm text-foreground-light">
|
|
Are you sure you want to leave this organization? This is permanent.
|
|
</p>
|
|
</ConfirmationModal>
|
|
</>
|
|
)
|
|
}
|