Skip to content

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

feat: block adding new owners to stripe orgs (#45601)

Raúl Barrosoedda1c40299c
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
index 3ee322a066c..f0a74b255d0 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
@@ -56,6 +56,7 @@ import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
import { DOCS_URL } from '@/lib/constants'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { useProfile } from '@/lib/profile'
export const InviteMemberButton = () => {
@@ -94,6 +95,8 @@ export const InviteMemberButton = () => {
(userMemberData?.role_ids ?? []).length === 1 &&
orgScopedRoles.some((r) => r.id === userMemberData?.role_ids[0])
+ const isStripeProjectsOrg = organization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
+
const { rolesAddable } = useGetRolesManagementPermissions(
organization?.slug,
orgScopedRoles,
@@ -308,18 +311,30 @@ export const InviteMemberButton = () => {
<SelectGroup_Shadcn_>
{orgScopedRoles.map((role) => {
const canAssignRole = rolesAddable.includes(role.id)
+ const isOwnerRole = role.name === 'Owner'
+ const disabledForStripe = isStripeProjectsOrg && isOwnerRole
+ const disabled = !canAssignRole || disabledForStripe
+ const disabledReason = disabledForStripe
+ ? 'Cannot be assigned in Stripe Projects organizations'
+ : !canAssignRole
+ ? 'Additional permissions required to assign role'
+ : undefined
return (
<SelectItem_Shadcn_
key={role.id}
value={role.id.toString()}
- className="text-sm [&>span:nth-child(2)]:w-full [&>span:nth-child(2)]:flex [&>span:nth-child(2)]:items-center [&>span:nth-child(2)]:justify-between"
- disabled={!canAssignRole}
+ className="text-sm"
+ disabled={disabled}
>
- <span>{role.name}</span>
- {!canAssignRole && (
- <span>Additional permissions required to assign role</span>
- )}
+ <div className="flex flex-col gap-0.5">
+ <span>{role.name}</span>
+ {disabledReason && (
+ <span className="text-xs text-foreground-lighter">
+ {disabledReason}
+ </span>
+ )}
+ </div>
</SelectItem_Shadcn_>
)
})}
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
index 465978ef348..b1a2c426ffb 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
@@ -47,6 +47,7 @@ import {
import { useHasAccessToProjectLevelPermissions } from '@/data/subscriptions/org-subscription-query'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { DOCS_URL } from '@/lib/constants'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
interface UpdateRolesPanelProps {
visible: boolean
@@ -77,6 +78,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
permissions ?? []
)
const cannotAddAnyRoles = orgScopedRoles.every((r) => !rolesAddable.includes(r.id))
+ const isStripeProjectsOrg = organization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
const [showConfirmation, setShowConfirmation] = useState(false)
const [showProjectDropdown, setShowProjectDropdown] = useState(false)
@@ -275,19 +277,34 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
>
{role?.name ?? 'Please select a role'}
</SelectTrigger_Shadcn_>
- <SelectContent_Shadcn_>
+ <SelectContent_Shadcn_ align="end">
<SelectGroup_Shadcn_>
{(orgScopedRoles ?? []).map((role) => {
const canAssignRole = rolesAddable.includes(role.id)
+ const isOwnerRole = role.name === 'Owner'
+ const disabledForStripe = isStripeProjectsOrg && isOwnerRole
+ const disabled = !canAssignRole || disabledForStripe
+ const disabledReason = disabledForStripe
+ ? 'Cannot be assigned in Stripe Projects organizations'
+ : !canAssignRole
+ ? 'Additional permissions required to assign role'
+ : undefined
return (
<SelectItem_Shadcn_
key={role.id}
value={role.id.toString()}
className="text-sm hover:bg-selection cursor-pointer"
- disabled={!canAssignRole}
+ disabled={disabled}
>
- {role.name}
+ <div className="flex flex-col gap-0.5">
+ <span>{role.name}</span>
+ {disabledReason && (
+ <span className="text-xs text-foreground-lighter">
+ {disabledReason}
+ </span>
+ )}
+ </div>
</SelectItem_Shadcn_>
)
})}