Skip to content

fix(cancel-subscription): cancel subscription needs reference id #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icecrasher321 merged 2 commits into from
Jul 11, 2025
Merged

fix(cancel-subscription): cancel subscription needs reference id #659

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617ea25
pass reference id to cancel func
Jul 10, 2025
af0dcf7
remove optional chain
Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions ...ebar/components/settings-modal/components/subscription/components/cancel-subscription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog'
import { useSubscription } from '@/lib/auth-client'
import { useSession, useSubscription } from '@/lib/auth-client'
import { createLogger } from '@/lib/logs/console-logger'
import { useOrganizationStore } from '@/stores/organization'
import { useSubscriptionStore } from '@/stores/subscription/store'

const logger = createLogger('CancelSubscription')

Expand All @@ -30,22 +32,40 @@ export function CancelSubscription({ subscription, subscriptionData }: CancelSub
const [isLoading, setIsLoading] = useState(false)
const [error, setError] = useState<string | null>(null)

const { data: session } = useSession()
const betterAuthSubscription = useSubscription()
const { activeOrganization } = useOrganizationStore()
const { getSubscriptionStatus } = useSubscriptionStore()

// Don't show for free plans
if (!subscription.isPaid) {
return null
}

const handleCancel = async () => {
if (!session?.user?.id) return

setIsLoading(true)
setError(null)

try {
// Use Better Auth client-side cancel method
// This redirects to Stripe Billing Portal where user can cancel
const result = await betterAuthSubscription.cancel?.({
returnUrl: window.location.href, // Return to current page after cancellation
const subscriptionStatus = getSubscriptionStatus()
const activeOrgId = activeOrganization?.id

let referenceId = session.user.id
if (subscriptionStatus.isTeam && activeOrgId) {
referenceId = activeOrgId
}

logger.info('Canceling subscription', {
referenceId,
isTeam: subscriptionStatus.isTeam,
activeOrgId,
})

const result = await betterAuthSubscription.cancel({
returnUrl: window.location.href,
referenceId,
})

if (result && 'error' in result && result.error) {
Expand Down