Skip to content

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

feat(studio): payment method states for Stripe Projects orgs (#44965)

Danny White9e3a10d55783
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/CreditCard.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/CreditCard.tsx
index a6af99ef01f..b59374ea89a 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/CreditCard.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/CreditCard.tsx
@@ -7,12 +7,17 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
} from 'ui'
import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
-import { OrganizationPaymentMethod } from '@/data/organizations/organization-payment-methods-query'
-import { PlanId } from '@/data/subscriptions/types'
+import PartnerIcon from '@/components/ui/PartnerIcon'
+import type { OrganizationPaymentMethod } from '@/data/organizations/organization-payment-methods-query'
+import type { PlanId } from '@/data/subscriptions/types'
import { BASE_PATH } from '@/lib/constants'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
interface CreditCardProps {
paymentMethod: OrganizationPaymentMethod
@@ -33,6 +38,8 @@ const CreditCard = ({
setSelectedMethodForUse,
setSelectedMethodToDelete,
}: CreditCardProps) => {
+ const isSpt = paymentMethod.type === 'shared_payment_token'
+ const spt = paymentMethod.shared_payment_token
const isActive = paymentMethod.is_default
const isRemovable =
!paymentMethod.is_default || (subscriptionPlan === 'free' && paymentMethodCount === 1)
@@ -43,74 +50,150 @@ const CreditCard = ({
const currentMonth = new Date().getMonth() + 1
const currentYear = new Date().getFullYear()
- const isExpiringSoon = expiryYear === currentYear && expiryMonth === currentMonth
- const isExpired =
+ const isCardExpiringSoon = expiryYear === currentYear && expiryMonth === currentMonth
+ const isCardExpired =
expiryYear < currentYear || (expiryYear === currentYear && expiryMonth < currentMonth)
+ const isTokenExpired = spt?.is_expired ?? false
+ const tokenExpiry = spt?.expires_at
+ ? `${new Date(spt.expires_at * 1000).getMonth() + 1}/${new Date(spt.expires_at * 1000).getFullYear()}`
+ : undefined
+ const cardExpiryLabel = `${expiryMonth}/${expiryYear}`
+
+ const stripeStatus = (() => {
+ if (!isSpt) return null
+ if (isTokenExpired) {
+ return {
+ label: 'Token expired',
+ variant: 'destructive' as const,
+ description: 'Stripe Projects token has expired',
+ }
+ }
+ if (isCardExpired) {
+ return {
+ label: 'Needs review',
+ variant: 'warning' as const,
+ description: 'Underlying card has expired',
+ }
+ }
+ if (isCardExpiringSoon) {
+ return {
+ label: 'Needs review',
+ variant: 'warning' as const,
+ description: 'Underlying card expires soon',
+ }
+ }
+ return {
+ label: 'Active',
+ variant: 'success' as const,
+ description: 'Stripe Projects token is active',
+ }
+ })()
if (!paymentMethod.card) return null
return (
- <div key={paymentMethod.id} className="flex items-center justify-between gap-8">
- <div className="flex items-center gap-8">
- <img
- alt="Credit card brand"
- src={`${BASE_PATH}/img/payment-methods/${paymentMethod.card.brand
- .replace(' ', '-')
- .toLowerCase()}.png`}
- width="32"
- />
- <p className="prose text-sm font-mono">**** **** **** {paymentMethod.card!.last4}</p>
- <p className="text-sm tabular-nums">
- Expires: {paymentMethod.card.exp_month}/{paymentMethod.card.exp_year}
- </p>
- </div>
+ <div key={paymentMethod.id} className="space-y-3">
+ <div className="flex items-center justify-between gap-8">
+ <div className="flex items-center gap-8">
+ <div className="relative shrink-0">
+ <img
+ alt="Credit card brand"
+ src={`${BASE_PATH}/img/payment-methods/${paymentMethod.card.brand
+ .replace(' ', '-')
+ .toLowerCase()}.png`}
+ width="32"
+ />
+ {isSpt && (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="absolute -bottom-1.5 -right-2 rounded-md bg-background outline outline-2 outline-background">
+ <PartnerIcon
+ organization={{ managed_by: MANAGED_BY.STRIPE_PROJECTS }}
+ showTooltip={false}
+ size="small"
+ />
+ </span>
+ </TooltipTrigger>
+ <TooltipContent side="top">Handled via Stripe Projects</TooltipContent>
+ </Tooltip>
+ )}
+ </div>
+ <div className="flex flex-col gap-0.5">
+ <div className="flex items-center gap-8">
+ <p className="prose text-sm font-mono">**** **** **** {paymentMethod.card.last4}</p>
+ <p className="text-sm tabular-nums">
+ Expires: {paymentMethod.card.exp_month}/{paymentMethod.card.exp_year}
+ </p>
+ </div>
+ {isSpt && spt && (
+ <div className="mt-2.5 flex items-center gap-2 border-t border-border-light pt-2.5 text-xs text-foreground-light">
+ <p className="m-0">
+ Managed via Stripe Projects · Token ending in{' '}
+ <code className="text-code-inline">{spt.last4}</code>
+ {tokenExpiry && <span> · Expires {tokenExpiry}</span>}
+ </p>
+ </div>
+ )}
+ </div>
+ </div>
- <div className="flex items-center gap-2">
- {isExpiringSoon && <Badge variant="warning">Expiring soon</Badge>}
- {isExpired && <Badge variant="destructive">Expired</Badge>}
- {isActive && <Badge variant="success">Active</Badge>}
+ <div className="flex items-center gap-2">
+ {!isSpt && isCardExpiringSoon && <Badge variant="warning">Expiring soon</Badge>}
+ {!isSpt && isCardExpired && <Badge variant="destructive">Expired</Badge>}
+ {!isSpt && !isCardExpired && isActive && <Badge variant="success">Active</Badge>}
+ {stripeStatus && (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span>
+ <Badge variant={stripeStatus.variant}>{stripeStatus.label}</Badge>
+ </span>
+ </TooltipTrigger>
+ <TooltipContent side="left">{stripeStatus.description}</TooltipContent>
+ </Tooltip>
+ )}
- {canUpdatePaymentMethods && (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- type="outline"
- className="hover:border-muted px-1"
- icon={<MoreHorizontal />}
- aria-label="More options"
- />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="w-36">
- {paymentMethodType === 'card' && !isActive && (
- <>
- <DropdownMenuItem
- key="make-default"
- onClick={() => setSelectedMethodForUse?.(paymentMethod)}
- >
- <p>Use this card</p>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- </>
- )}
- <DropdownMenuItemTooltip
- key="delete-method"
- disabled={!isRemovable}
- className="!pointer-events-auto"
- onClick={() => setSelectedMethodToDelete?.(paymentMethod)}
- tooltip={{
- content: {
- side: 'left',
- text: !isRemovable
- ? 'Unable to delete a card that is currently active'
- : undefined,
- },
- }}
- >
- <p>Delete card</p>
- </DropdownMenuItemTooltip>
- </DropdownMenuContent>
- </DropdownMenu>
- )}
+ {canUpdatePaymentMethods && !isSpt && (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ type="outline"
+ className="hover:border-muted px-1"
+ icon={<MoreHorizontal />}
+ aria-label="More options"
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="w-36">
+ {paymentMethodType === 'card' && !isActive && (
+ <>
+ <DropdownMenuItem
+ key="make-default"
+ onClick={() => setSelectedMethodForUse?.(paymentMethod)}
+ >
+ <p>Use this card</p>
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ </>
+ )}
+ <DropdownMenuItemTooltip
+ key="delete-method"
+ disabled={!isRemovable}
+ className="!pointer-events-auto"
+ onClick={() => setSelectedMethodToDelete?.(paymentMethod)}
+ tooltip={{
+ content: {
+ side: 'left',
+ text: !isRemovable
+ ? 'Unable to delete a card that is currently active'
+ : undefined,
+ },
+ }}
+ >
+ <p>Delete card</p>
+ </DropdownMenuItemTooltip>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )}
+ </div>
</div>
</div>
)
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
index e3cad739f63..fecbfd6e02f 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
@@ -82,6 +82,24 @@ describe('PaymentMethods', () => {
expect(screen.getByText('No payment methods')).toBeInTheDocument()
})
+ it('uses Stripe Projects guidance instead of support for invoice-based Stripe orgs', () => {
+ mockSubscription.mockReturnValue({
+ payment_method_type: 'invoice',
+ plan: { id: 'pro', name: 'Pro' },
+ })
+
+ render(<PaymentMethods />)
+
+ expect(screen.getByText('Payment is currently by invoice')).toBeInTheDocument()
+ expect(screen.getByText(/Manage payment methods through Stripe Projects/)).toBeInTheDocument()
+ expect(
+ screen.getByRole('link', {
+ name: 'View Stripe Projects docs',
+ })
+ ).toBeInTheDocument()
+ expect(screen.queryByText('Contact support')).not.toBeInTheDocument()
+ })
+
it('still shows the partner-managed fallback for billing partners', () => {
mockSelectedOrganization.mockReturnValue(
createMockOrganization({
@@ -95,4 +113,84 @@ describe('PaymentMethods', () => {
expect(screen.getByTestId('partner-managed-resource')).toBeInTheDocument()
})
+
+ it('keeps the standard card row copy for non-Stripe payment methods', () => {
+ mockSelectedOrganization.mockReturnValue(
+ createMockOrganization({
+ slug: 'self-serve-org',
+ billing_partner: null,
+ integration_source: null,
+ managed_by: MANAGED_BY.SUPABASE,
+ })
+ )
+ mockPaymentMethodsQuery.mockReturnValue({
+ data: {
+ data: [
+ {
+ id: 'pm_123',
+ type: 'card',
+ is_default: true,
+ has_address: true,
+ created: 1_776_700_000,
+ card: {
+ brand: 'visa',
+ exp_month: 12,
+ exp_year: 2028,
+ last4: '4242',
+ },
+ shared_payment_token: null,
+ },
+ ],
+ },
+ error: null,
+ isPending: false,
+ isError: false,
+ isSuccess: true,
+ })
+
+ render(<PaymentMethods />)
+
+ expect(screen.getByText('Expires: 12/2028')).toBeInTheDocument()
+ expect(screen.queryByText(/Managed via Stripe Projects/i)).not.toBeInTheDocument()
+ })
+
+ it('shows Stripe Projects payment method details separately from the underlying card', () => {
+ mockPaymentMethodsQuery.mockReturnValue({
+ data: {
+ data: [
+ {
+ id: 'spt._1T0w6VJDPojXS6LNK3clVOLZ',
+ type: 'shared_payment_token',
+ is_default: true,
+ has_address: true,
+ created: 1_776_700_000,
+ card: {
+ brand: 'visa',
+ exp_month: 12,
+ exp_year: 2028,
+ last4: '4242',
+ },
+ shared_payment_token: {
+ last4: 'VOLZ',
+ expires_at: 1_860_883_200,
+ is_expired: false,
+ },
+ },
+ ],
+ },
+ error: null,
+ isPending: false,
+ isError: false,
+ isSuccess: true,
+ })
+
+ render(<PaymentMethods />)
+
+ expect(screen.getByText('**** **** **** 4242')).toBeInTheDocument()
+ expect(screen.getByText('Expires: 12/2028')).toBeInTheDocument()
+ expect(screen.getByText(/Managed via Stripe Projects/i)).toBeInTheDocument()
+ expect(screen.getByText('VOLZ')).toBeInTheDocument()
+ expect(screen.getByText(/Expires 12\/2028/i, { selector: 'span' })).toBeInTheDocument()
+ expect(screen.getByText('Active')).toBeInTheDocument()
+ })
})
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
index a620da5c932..a4cb48fa3fd 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
@@ -1,6 +1,6 @@
import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
-import { CreditCardIcon, Plus } from 'lucide-react'
+import { CreditCardIcon, ExternalLink, Plus } from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
import { Button } from 'ui'
@@ -27,6 +27,7 @@ import { useOrganizationPaymentMethodsQuery } from '@/data/organizations/organiz
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { getURL } from '@/lib/helpers'
const PaymentMethods = () => {
@@ -56,7 +57,8 @@ const PaymentMethods = () => {
const isPartnerBilledOrganization = isPartnerBillingOrganization(
selectedOrganization?.billing_partner
)
-
+ const isStripeManagedOrganization =
+ selectedOrganization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
return (
<>
<ScaffoldSection>
@@ -64,7 +66,9 @@ const PaymentMethods = () => {
<div className="sticky space-y-2 top-12">
<p className="text-foreground text-base m-0">Payment Methods</p>
<p className="text-sm text-foreground-light mb-2 pr-4 m-0">
- Payments for your subscription are made using the default card.
+ {isStripeManagedOrganization
+ ? 'Billing for this organisation is handled through Stripe Projects.'
+ : 'Payments for your subscription are made using the default card.'}
</p>
</div>
</ScaffoldSectionDetail>
@@ -100,41 +104,63 @@ const PaymentMethods = () => {
type="note"
layout="horizontal"
title="Payment is currently by invoice"
- description="You get a monthly invoice and payment link via email. To change your payment
- method, please contact us via our support form."
+ description={
+ isStripeManagedOrganization
+ ? 'You get a monthly invoice and payment link via email. Manage payment methods through Stripe Projects.'
+ : 'You get a monthly invoice and payment link via email. To change your payment method, please contact us via our support form.'
+ }
actions={
- <Button asChild key="payment-method-support" type="default">
- <SupportLink
- queryParams={{
- category: SupportCategories.BILLING,
- subject: 'Request to change payment method',
- }}
+ isStripeManagedOrganization ? (
+ <Button
+ asChild
+ key="stripe-projects-billing-docs"
+ type="default"
+ iconRight={<ExternalLink size={14} />}
>
- Contact support
- </SupportLink>
- </Button>
+ <a
+ href="https://docs.stripe.com/projects#manage-billing"
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ View Stripe Projects docs
+ </a>
+ </Button>
+ ) : (
+ <Button asChild key="payment-method-support" type="default">
+ <SupportLink
+ queryParams={{
+ category: SupportCategories.BILLING,
+ subject: 'Request to change payment method',
+ }}
+ >
+ Contact support
+ </SupportLink>
+ </Button>
+ )
}
/>
)}
<FormPanel
footer={
- <div className="flex items-center justify-between py-4 px-8">
- {!canUpdatePaymentMethods ? (
- <p className="text-sm text-foreground-light">
- You need additional permissions to manage payment methods
- </p>
- ) : (
- <div />
- )}
- <Button
- type="default"
- icon={<Plus />}
- disabled={!canUpdatePaymentMethods}
- onClick={() => setShowAddPaymentMethodModal(true)}
- >
- Add new card
- </Button>
- </div>
+ !isStripeManagedOrganization ? (
+ <div className="flex items-center justify-between py-4 px-8">
+ {!canUpdatePaymentMethods ? (
+ <p className="text-sm text-foreground-light">
+ You need additional permissions to manage payment methods
+ </p>
+ ) : (
+ <div />
+ )}
+ <Button
+ type="default"
+ icon={<Plus />}
+ disabled={!canUpdatePaymentMethods}
+ onClick={() => setShowAddPaymentMethodModal(true)}
+ >
+ Add new card
+ </Button>
+ </div>
+ ) : undefined
}
>
<FormSection>
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/StripePaymentConnection.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/StripePaymentConnection.tsx
new file mode 100644
index 00000000000..1c883656faf
--- /dev/null
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/StripePaymentConnection.tsx
@@ -0,0 +1,89 @@
+import { ExternalLink } from 'lucide-react'
+import { Button } from 'ui'
+import { Admonition } from 'ui-patterns/admonition'
+
+import PartnerIcon from '@/components/ui/PartnerIcon'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
+
+export type StripeTokenStatus = 'connected' | 'attention' | 'unknown'
+
+export const STRIPE_DASHBOARD_URL = 'https://dashboard.stripe.com'
+export const STRIPE_PROJECTS_DOCS_URL = 'https://docs.stripe.com/projects'
+
+interface StripePaymentConnectionProps {
+ status?: StripeTokenStatus
+ tokenLast4?: string | null
+ tokenExpiresAt?: number | null
+}
+
+const formatStripeTokenExpiry = (expiresAt?: number | null) => {
+ if (!expiresAt) return undefined
+ return new Date(expiresAt * 1000).toLocaleDateString('en-US', { month: 'short', year: 'numeric' })
+}
+
+export function StripePaymentConnection({
+ status = 'connected',
+ tokenLast4,
+ tokenExpiresAt,
+}: StripePaymentConnectionProps) {
+ const tokenExpiry = formatStripeTokenExpiry(tokenExpiresAt)
+ const hasTokenSummary =
+ tokenLast4 !== null && tokenLast4 !== undefined && tokenExpiry !== undefined
+
+ if (status === 'attention') {
+ return (
+ <Admonition
+ type="warning"
+ title="Stripe payment connection needs attention"
+ description="The payment token linked to this organisation may be invalid or expired. To keep billing active, review and update it in your Stripe Dashboard."
+ actions={
+ <Button asChild type="warning" iconRight={<ExternalLink size={14} />}>
+ <a href={STRIPE_DASHBOARD_URL} target="_blank" rel="noopener noreferrer">
+ Review in Stripe Dashboard
+ </a>
+ </Button>
+ }
+ />
+ )
+ }
+
+ if (status === 'unknown') {
+ return (
+ <Admonition
+ type="default"
+ title="Stripe payment setup in progress"
+ description="Your Stripe payment connection is being configured. Check back shortly."
+ />
+ )
+ }
+
+ return (
+ <div className="flex flex-col items-center gap-y-3 py-4 text-center">
+ <PartnerIcon
+ organization={{ managed_by: MANAGED_BY.STRIPE_PROJECTS }}
+ showTooltip={false}
+ size="large"
+ />
+ <div className="space-y-1">
+ <p className="text-sm text-foreground">Payment managed through Stripe</p>
+ <p className="text-sm text-foreground-light max-w-sm text-balance">
+ Billing for this organisation is handled via a connected Stripe payment token.
+ </p>
+ {hasTokenSummary && (
+ <p className="text-xs text-foreground-light">
+ Token ending in {tokenLast4} expires {tokenExpiry}.
+ </p>
+ )}
+ </div>
+ <Button asChild type="default" iconRight={<ExternalLink size={14} />}>
+ <a
+ href={`${STRIPE_PROJECTS_DOCS_URL}#manage-billing`}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ Manage via Stripe CLI
+ </a>
+ </Button>
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingSettings.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingSettings.tsx
index b255efad6b0..efd337d2413 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingSettings.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingSettings.tsx
@@ -17,6 +17,7 @@ import {
import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
+import { MANAGED_BY } from '@/lib/constants/infrastructure'
export const BillingSettings = () => {
const {
@@ -34,11 +35,12 @@ export const BillingSettings = () => {
const { data: org } = useSelectedOrganizationQuery()
const { data: subscription } = useOrgSubscriptionQuery({ orgSlug: org?.slug })
const isNotOrgWithPartnerBilling = !subscription?.billing_via_partner
+ const isStripeOrg = org?.managed_by === MANAGED_BY.STRIPE_PROJECTS
const billingAccountDataEnabled =
isBillingAccountDataEnabledOnProfileLevel && isNotOrgWithPartnerBilling
const billingPaymentMethodsEnabled =
- isBillingPaymentMethodsEnabledOnProfileLevel && isNotOrgWithPartnerBilling
+ isBillingPaymentMethodsEnabledOnProfileLevel && (isNotOrgWithPartnerBilling || isStripeOrg)
return (
<>
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
index aed47f6cc38..8fbdb8fad04 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.test.tsx
@@ -7,6 +7,7 @@ import { createMockOrganization, render } from '@/tests/helpers'
const mockSelectedOrganization = vi.hoisted(() => vi.fn())
const mockPush = vi.hoisted(() => vi.fn())
+const mockPartnerManagedResource = vi.hoisted(() => vi.fn())
vi.mock('common', async (importOriginal) => {
const original = (await importOriginal()) as typeof import('common')
@@ -86,7 +87,10 @@ vi.mock('@/data/organizations/organization-billing-subscription-preview', () =>
}))
vi.mock('@/components/ui/PartnerManagedResource', () => ({
- default: () => <div data-testid="partner-managed-resource" />,
+ default: (props: any) => {
+ mockPartnerManagedResource(props)
+ return <div data-testid="partner-managed-resource">{props.details}</div>
+ },
}))
vi.mock('./EnterpriseCard', () => ({
@@ -126,13 +130,46 @@ describe('PlanUpdateSidePanel', () => {
)
})
- it('does not treat Stripe-connected orgs as partner-billed', () => {
+ it('shows Stripe-managed messaging without treating Stripe orgs as partner-billed', () => {
render(<PlanUpdateSidePanel />)
- expect(screen.queryByTestId('partner-managed-resource')).not.toBeInTheDocument()
+ expect(screen.getByTestId('partner-managed-resource')).toBeInTheDocument()
+ expect(screen.getByText('stripe projects upgrade supabase/free')).toBeInTheDocument()
expect(screen.getByRole('button', { name: 'Upgrade to Pro' })).toBeInTheDocument()
})
+ it('uses the current plan in the Stripe Projects upgrade command', () => {
+ mockSelectedOrganization.mockReturnValue(
+ createMockOrganization({
+ slug: 'stripe-org',
+ billing_partner: null,
+ integration_source: 'stripe_projects',
+ managed_by: MANAGED_BY.STRIPE_PROJECTS,
+ plan: { id: 'pro', name: 'Pro' },
+ })
+ )
+
+ render(<PlanUpdateSidePanel />)
+
+ expect(screen.getByText('stripe projects upgrade supabase/pro')).toBeInTheDocument()
+ })
+
+ it('uses the Stripe Projects downgrade command for team plans', () => {
+ mockSelectedOrganization.mockReturnValue(
+ createMockOrganization({
+ slug: 'stripe-org',
+ billing_partner: null,
+ integration_source: 'stripe_projects',
+ managed_by: MANAGED_BY.STRIPE_PROJECTS,
+ plan: { id: 'team', name: 'Team' },
+ })
+ )
+
+ render(<PlanUpdateSidePanel />)
+
+ expect(screen.getByText('stripe projects downgrade supabase/team')).toBeInTheDocument()
+ })
+
it('still shows partner-managed messaging for billing-partner orgs', () => {
mockSelectedOrganization.mockReturnValue(
createMockOrganization({
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
index 95f4548f3aa..da1a3e9d649 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx
@@ -16,6 +16,7 @@ import { ExitSurveyModal } from './ExitSurveyModal'
import MembersExceedLimitModal from './MembersExceedLimitModal'
import { SubscriptionPlanUpdateDialog } from './SubscriptionPlanUpdateDialog'
import UpgradeSurveyModal from './UpgradeModal'
+import { STRIPE_PROJECTS_DOCS_URL } from '@/components/interfaces/Billing/Payment/PaymentMethods/StripePaymentConnection'
import { getPlanChangeType } from '@/components/interfaces/Billing/Subscription/Subscription.utils'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import PartnerManagedResource from '@/components/ui/PartnerManagedResource'
@@ -42,7 +43,7 @@ const getPartnerManagedResourceCta = (selectedOrganization: Organization) => {
return {
installationId: selectedOrganization?.partner_id,
path: '/settings',
- message: 'Change Plan on Vercel Marketplace',
+ message: 'Change plan on Vercel Marketplace',
}
}
if (selectedOrganization.managed_by === MANAGED_BY.AWS_MARKETPLACE) {
@@ -52,6 +53,12 @@ const getPartnerManagedResourceCta = (selectedOrganization: Organization) => {
}
}
+const getStripeProjectsUpgradeCommand = (planId: string | null | undefined) => {
+ const currentTier = planId ?? 'free'
+ const action = currentTier === 'team' ? 'downgrade' : 'upgrade'
+ return `stripe projects ${action} supabase/${currentTier}`
+}
+
export const PlanUpdateSidePanel = () => {
const router = useRouter()
const { slug } = useParams()
@@ -59,6 +66,8 @@ export const PlanUpdateSidePanel = () => {
const isPartnerBilledOrganization = isPartnerBillingOrganization(
selectedOrganization?.billing_partner
)
+ const isStripeManagedOrganization =
+ selectedOrganization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
const { mutate: sendEvent } = useSendEventMutation()
const originalPlanRef = useRef<string>()
@@ -189,6 +198,9 @@ export const PlanUpdateSidePanel = () => {
const planMeta = selectedTier
? availablePlans.find((p) => p.id === selectedTier.split('tier_')[1])
: null
+ const stripeProjectsUpgradeCommand = getStripeProjectsUpgradeCommand(
+ selectedOrganization?.plan?.id ?? subscription?.plan?.id
+ )
return (
<>
@@ -208,13 +220,30 @@ export const PlanUpdateSidePanel = () => {
</div>
}
>
- {selectedOrganization && isPartnerBilledOrganization && (
- <PartnerManagedResource
- managedBy={selectedOrganization.managed_by}
- resource="Organization plans"
- cta={getPartnerManagedResourceCta(selectedOrganization)}
- />
- )}
+ {selectedOrganization &&
+ (isStripeManagedOrganization ? (
+ <PartnerManagedResource
+ managedBy={MANAGED_BY.STRIPE_PROJECTS}
+ resource="Organization plans"
+ title="Organization plans are managed through Stripe."
+ details={
+ <>
+ Run <code className="text-code-inline">{stripeProjectsUpgradeCommand}</code> in
+ your project directory.
+ </>
+ }
+ cta={{
+ overrideUrl: `${STRIPE_PROJECTS_DOCS_URL}#upgrade-a-service-tier`,
+ message: 'Stripe Projects docs',
+ }}
+ />
+ ) : isPartnerBilledOrganization ? (
+ <PartnerManagedResource
+ managedBy={selectedOrganization.managed_by}
+ resource="Organization plans"
+ cta={getPartnerManagedResourceCta(selectedOrganization)}
+ />
+ ) : null)}
<SidePanel.Content>
<div className="py-6 grid grid-cols-12 gap-3">
{subscriptionsPlans.map((plan) => {
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx
new file mode 100644
index 00000000000..4ce21d8f9bb
--- /dev/null
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.test.tsx
@@ -0,0 +1,93 @@
+import { fireEvent, screen } from '@testing-library/react'
+import type { ReactNode } from 'react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import Subscription from './Subscription'
+import { render } from '@/tests/helpers'
+
+const { mockSubscription, mockSetPanelKey } = vi.hoisted(() => ({
+ mockSubscription: vi.fn(),
+ mockSetPanelKey: vi.fn(),
+}))
+
+vi.mock('common', async (importOriginal) => {
+ const original = (await importOriginal()) as typeof import('common')
+ return {
+ ...original,
+ useParams: () => ({ slug: 'stripe-org' }),
+ useFlag: () => false,
+ }
+})
+
+vi.mock('@/data/subscriptions/org-subscription-query', () => ({
+ useOrgSubscriptionQuery: () => mockSubscription(),
+}))
+
+vi.mock('@/hooks/misc/useCheckPermissions', () => ({
+ useAsyncCheckPermissions: () => ({ can: true, isSuccess: true }),
+}))
+
+vi.mock('@/state/organization-settings', () => ({
+ useOrgSettingsPageStateSnapshot: () => ({
+ setPanelKey: mockSetPanelKey,
+ }),
+}))
+
+vi.mock('../Restriction', () => ({
+ Restriction: () => null,
+}))
+
+vi.mock('../ProjectUpdateDisabledTooltip', () => ({
+ ProjectUpdateDisabledTooltip: ({ children }: { children: ReactNode }) => children,
+}))
+
+vi.mock('./PlanUpdateSidePanel', () => ({
+ PlanUpdateSidePanel: () => null,
+}))
+
+describe('Subscription', () => {
+ beforeEach(() => {
+ vi.clearAllMocks()
+ mockSubscription.mockReturnValue({
+ data: {
+ plan: { id: 'free', name: 'Free' },
+ usage_billing_enabled: true,
+ },
+ error: null,
+ isPending: false,
+ isError: false,
+ isSuccess: true,
+ })
+ })
+
+ it('shows the plan-change CTA and opens the side panel when clicked', () => {
+ render(<Subscription />)
+ const button = screen.getByRole('button', { name: 'Change subscription plan' })
+ expect(button).toBeInTheDocument()
+ expect(mockSetPanelKey).not.toHaveBeenCalled()
+
+ fireEvent.click(button)
+
+ expect(mockSetPanelKey).toHaveBeenCalledWith('subscriptionPlan')
+ })
+
+ it('shows the support fallback when plan changes are not available', () => {
+ mockSubscription.mockReturnValue({
+ data: {
+ plan: { id: 'enterprise', name: 'Enterprise' },
+ usage_billing_enabled: true,
+ },
+ error: null,
+ isPending: false,
+ isError: false,
+ isSuccess: true,
+ })
+
+ render(<Subscription />)
+
+ expect(
+ screen.queryByRole('button', { name: 'Change subscription plan' })
+ ).not.toBeInTheDocument()
+ expect(screen.getByText('Unable to update plan from Enterprise')).toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
index 80ebf682fa6..a4efb0fbcb2 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
@@ -83,7 +83,7 @@ const Subscription = () => {
</div>
<div>
- {canChangeTier && (
+ {canChangeTier ? (
<ProjectUpdateDisabledTooltip projectUpdateDisabled={projectUpdateDisabled}>
<Button
type="default"
@@ -94,40 +94,38 @@ const Subscription = () => {
Change subscription plan
</Button>
</ProjectUpdateDisabledTooltip>
+ ) : projectUpdateDisabled ? (
+ <Alert
+ className="mt-2"
+ withIcon
+ variant="info"
+ title={`Unable to update plan from ${planName}`}
+ >
+ We have temporarily disabled project and subscription changes - our
+ engineers are working on a fix.
+ </Alert>
+ ) : (
+ <Alert
+ withIcon
+ className="mt-2"
+ variant="info"
+ title={`Unable to update plan from ${planName}`}
+ actions={[
+ <Button asChild key="contact-support" type="default">
+ <SupportLink
+ queryParams={{
+ category: SupportCategories.SALES_ENQUIRY,
+ subject: `Change plan away from ${planName}`,
+ }}
+ >
+ Contact support
+ </SupportLink>
+ </Button>,
+ ]}
+ >
+ Please contact us if you'd like to change your plan.
+ </Alert>
)}
- {!canChangeTier &&
- (projectUpdateDisabled ? (
- <Alert
- className="mt-2"
- withIcon
- variant="info"
- title={`Unable to update plan from ${planName}`}
- >
- We have temporarily disabled project and subscription changes - our
- engineers are working on a fix.
- </Alert>
- ) : (
- <Alert
- withIcon
- className="mt-2"
- variant="info"
- title={`Unable to update plan from ${planName}`}
- actions={[
- <Button asChild key="contact-support" type="default">
- <SupportLink
- queryParams={{
- category: SupportCategories.SALES_ENQUIRY,
- subject: `Change plan away from ${planName}`,
- }}
- >
- Contact support
- </SupportLink>
- </Button>,
- ]}
- >
- Please contact us if you'd like to change your plan.
- </Alert>
- ))}
</div>
{!subscription?.usage_billing_enabled && (
diff --git a/apps/studio/components/ui/PartnerManagedResource.test.tsx b/apps/studio/components/ui/PartnerManagedResource.test.tsx
index 3ec886e332b..537d366e590 100644
--- a/apps/studio/components/ui/PartnerManagedResource.test.tsx
+++ b/apps/studio/components/ui/PartnerManagedResource.test.tsx
@@ -43,11 +43,17 @@ describe('PartnerManagedResource', () => {
<PartnerManagedResource
managedBy={MANAGED_BY.STRIPE_PROJECTS}
resource="Payment Methods"
+ details={
+ <>
+ Run <code>stripe projects upgrade supabase/free</code>
+ </>
+ }
cta={{ installationId: 'vercel-installation-id', organizationSlug: 'aws-org' }}
/>
)
- expect(screen.getByText('Payment Methods are connected to Stripe.')).toBeInTheDocument()
+ expect(screen.getByText('Payment Methods are connected to Stripe')).toBeInTheDocument()
+ expect(screen.getByText('stripe projects upgrade supabase/free')).toBeInTheDocument()
expect(screen.queryByRole('link')).toBeNull()
expect(mockUseVercelRedirectQuery).toHaveBeenCalledWith(
{ installationId: 'vercel-installation-id' },
@@ -74,7 +80,7 @@ describe('PartnerManagedResource', () => {
/>
)
- expect(screen.getByText('Invoices are managed by AWS Marketplace.')).toBeInTheDocument()
+ expect(screen.getByText('Invoices are managed by AWS Marketplace')).toBeInTheDocument()
expect(screen.getByRole('link', { name: 'View Invoices on AWS Marketplace' })).toHaveAttribute(
'href',
'https://console.aws.amazon.com/billing/home#/bills'
@@ -97,7 +103,7 @@ describe('PartnerManagedResource', () => {
)
expect(
- screen.getByText('Organization plans are managed by Vercel Marketplace.')
+ screen.getByText('Organization plans are managed by Vercel Marketplace')
).toBeInTheDocument()
expect(screen.queryByRole('link', { name: /view organization plans/i })).toBeNull()
})
diff --git a/apps/studio/components/ui/PartnerManagedResource.tsx b/apps/studio/components/ui/PartnerManagedResource.tsx
index 55822ef0ace..19211d4add4 100644
--- a/apps/studio/components/ui/PartnerManagedResource.tsx
+++ b/apps/studio/components/ui/PartnerManagedResource.tsx
@@ -1,4 +1,5 @@
import { ExternalLink } from 'lucide-react'
+import type { ReactNode } from 'react'
import { Alert_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'
import PartnerIcon from './PartnerIcon'
@@ -9,6 +10,8 @@ import { MANAGED_BY, ManagedBy } from '@/lib/constants/infrastructure'
interface PartnerManagedResourceProps {
managedBy: ManagedBy
resource: string
+ title?: string
+ details?: ReactNode
cta?: {
installationId?: string
organizationSlug?: string
@@ -25,7 +28,13 @@ export const PARTNER_TO_NAME = {
[MANAGED_BY.SUPABASE]: 'Supabase',
} as const
-function PartnerManagedResource({ managedBy, resource, cta }: PartnerManagedResourceProps) {
+function PartnerManagedResource({
+ managedBy,
+ resource,
+ title,
+ details,
+ cta,
+}: PartnerManagedResourceProps) {
const ctaEnabled = cta !== undefined
const supportsRedirectCta =
managedBy === MANAGED_BY.VERCEL_MARKETPLACE || managedBy === MANAGED_BY.AWS_MARKETPLACE
@@ -61,17 +70,20 @@ function PartnerManagedResource({ managedBy, resource, cta }: PartnerManagedReso
const redirectBaseUrl = selectedRedirectQuery?.data?.url
const ctaUrl =
cta?.overrideUrl ?? (redirectBaseUrl ? `${redirectBaseUrl}${cta?.path ?? ''}` : undefined)
- const showCta = ctaEnabled && supportsRedirectCta && Boolean(ctaUrl)
+ const showCta = ctaEnabled && Boolean(ctaUrl)
const partnerHeading =
- managedBy === MANAGED_BY.STRIPE_PROJECTS
- ? `${resource} are connected to Stripe.`
- : `${resource} are managed by ${PARTNER_TO_NAME[managedBy]}.`
+ title ??
+ (managedBy === MANAGED_BY.STRIPE_PROJECTS
+ ? `${resource} are connected to Stripe`
+ : `${resource} are managed by ${PARTNER_TO_NAME[managedBy]}`)
return (
- <Alert_Shadcn_ className="flex flex-col items-center gap-y-2 border-0 rounded-none">
+ <Alert_Shadcn_ className="flex flex-col items-center gap-y-2 border-0 rounded-none bg-none">
<PartnerIcon organization={{ managed_by: managedBy }} showTooltip={false} size="large" />
- <AlertTitle_Shadcn_ className="text-sm">{partnerHeading}</AlertTitle_Shadcn_>
+ <AlertTitle_Shadcn_ className="text-sm font-normal">{partnerHeading}</AlertTitle_Shadcn_>
+
+ {details && <div className="text-sm text-foreground-light text-center">{details}</div>}
{showCta && (
<Button asChild type="default" iconRight={<ExternalLink />}>
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index d78a970759c..c35f44e7d36 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -8090,6 +8090,11 @@ export interface components {
has_address: boolean
id: string
is_default: boolean
+ shared_payment_token: {
+ expires_at: number | null
+ is_expired: boolean
+ last4: string
+ } | null
type: string
}[]
defaultPaymentMethodId: string | null