-
Notifications
You must be signed in to change notification settings - Fork 388
feat(astro): Add Billing buttons #6583
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.
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
Changes from all commits
62c50de
1563197
86b0d3b
faa409c
5224ca1
070e816
183001f
2fdb49b
7264ec5
a2c36bf
c9e754e
46a3560
7b27c8a
dfc13a3
62dae1f
ff60376
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@clerk/astro': minor | ||
--- | ||
|
||
Expose billing buttons as experimental |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
--- | ||
import { SignedIn, __experimental_CheckoutButton as CheckoutButton } from '@clerk/astro/components'; | ||
import Layout from '../../layouts/Layout.astro'; | ||
--- | ||
|
||
<Layout title="Checkout Button"> | ||
<main> | ||
<SignedIn> | ||
<CheckoutButton | ||
planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF' | ||
planPeriod='month' | ||
> | ||
Checkout Now | ||
</CheckoutButton> | ||
</SignedIn> | ||
</main> | ||
</Layout> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- | ||
import { PlanDetailsButton } from '@clerk/astro/components'; | ||
import Layout from '../../layouts/Layout.astro'; | ||
--- | ||
|
||
<Layout title="Plan Details Button"> | ||
<main> | ||
<PlanDetailsButton planId='cplan_2wMjqdlza0hTJc4HLCoBwAiExhF'> | ||
Plan details | ||
</PlanDetailsButton> | ||
</main> | ||
</Layout> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- | ||
import { __experimental_SubscriptionDetailsButton as SubscriptionDetailsButton } from '@clerk/astro/components'; | ||
import Layout from '../../layouts/Layout.astro'; | ||
--- | ||
|
||
<Layout title="Subscription Details Button"> | ||
<main> | ||
<SubscriptionDetailsButton> | ||
Subscription details | ||
</SubscriptionDetailsButton> | ||
</main> | ||
</Layout> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
--- | ||
import type { HTMLTag, Polymorphic } from 'astro/types'; | ||
import type { __experimental_CheckoutButtonProps } from '@clerk/types'; | ||
import type { ButtonProps } from '../../types'; | ||
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils'; | ||
|
||
type Props<Tag extends HTMLTag = 'button'> = Polymorphic<ButtonProps<Tag>> & | ||
Omit<__experimental_CheckoutButtonProps, 'onSubscriptionComplete'> & { clickIdentifier?: string }; | ||
|
||
import { generateSafeId } from '@clerk/astro/internal'; | ||
|
||
const safeId = generateSafeId(); | ||
|
||
if ('as' in Astro.props) { | ||
logAsPropUsageDeprecation(); | ||
} | ||
|
||
const { | ||
as: Tag = 'button', | ||
asChild, | ||
planId, | ||
planPeriod, | ||
for: _for, | ||
newSubscriptionRedirectUrl, | ||
checkoutProps, | ||
clickIdentifier, | ||
...props | ||
} = Astro.props; | ||
|
||
const checkoutOptions = { | ||
planId, | ||
planPeriod, | ||
for: _for, | ||
newSubscriptionRedirectUrl, | ||
clickIdentifier, | ||
...checkoutProps, | ||
}; | ||
|
||
let htmlElement = ''; | ||
|
||
if (asChild) { | ||
htmlElement = await Astro.slots.render('default'); | ||
htmlElement = addUnstyledAttributeToFirstTag(htmlElement, safeId); | ||
} | ||
--- | ||
|
||
{ | ||
asChild ? ( | ||
<Fragment set:html={htmlElement} /> | ||
) : ( | ||
<Tag | ||
{...props} | ||
data-clerk-unstyled-id={safeId} | ||
> | ||
<slot>Checkout</slot> | ||
</Tag> | ||
) | ||
} | ||
|
||
<script is:inline define:vars={{ props, checkoutOptions, safeId }}> | ||
const btn = document.querySelector(`[data-clerk-unstyled-id="${safeId}"]`); | ||
|
||
btn.addEventListener('click', () => { | ||
const clerk = window.Clerk; | ||
|
||
// Authentication checks | ||
if (!clerk.user) { | ||
throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.'); | ||
} | ||
|
||
if (!clerk.organization && checkoutOptions.for === 'organization') { | ||
throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.'); | ||
} | ||
|
||
console.log('checkoutOptions', checkoutOptions); | ||
|
||
if (checkoutOptions.clickIdentifier) { | ||
const clickEvent = new CustomEvent('clerk:subscription-complete', { detail: checkoutOptions.clickIdentifier }); | ||
checkoutOptions.onSubscriptionComplete = () => { | ||
document.dispatchEvent(clickEvent); | ||
}; | ||
} | ||
|
||
return clerk.__internal_openCheckout(checkoutOptions); | ||
}); | ||
</script> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
--- | ||
import type { HTMLTag, Polymorphic } from 'astro/types'; | ||
import type { __experimental_PlanDetailsButtonProps } from '@clerk/types'; | ||
import type { ButtonProps } from '../../types'; | ||
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils'; | ||
|
||
type Props<Tag extends HTMLTag = 'button'> = Polymorphic<ButtonProps<Tag>> & __experimental_PlanDetailsButtonProps; | ||
|
||
import { generateSafeId } from '@clerk/astro/internal'; | ||
|
||
const safeId = generateSafeId(); | ||
|
||
if ('as' in Astro.props) { | ||
logAsPropUsageDeprecation(); | ||
} | ||
|
||
const { as: Tag = 'button', asChild, plan, planId, initialPlanPeriod, planDetailsProps, ...props } = Astro.props; | ||
|
||
const planDetailsOptions = { | ||
plan, | ||
planId, | ||
initialPlanPeriod, | ||
...planDetailsProps, | ||
}; | ||
|
||
let htmlElement = ''; | ||
|
||
if (asChild) { | ||
htmlElement = await Astro.slots.render('default'); | ||
htmlElement = addUnstyledAttributeToFirstTag(htmlElement, safeId); | ||
} | ||
--- | ||
|
||
{ | ||
asChild ? ( | ||
<Fragment set:html={htmlElement} /> | ||
) : ( | ||
<Tag | ||
{...props} | ||
data-clerk-unstyled-id={safeId} | ||
> | ||
<slot>Plan details</slot> | ||
</Tag> | ||
panteliselef marked this conversation as resolved.
Show resolved
Hide resolved
|
||
) | ||
} | ||
|
||
<script is:inline define:vars={{ props, planDetailsOptions, safeId }}> | ||
const btn = document.querySelector(`[data-clerk-unstyled-id="${safeId}"]`); | ||
|
||
btn.addEventListener('click', () => { | ||
const clerk = window.Clerk; | ||
|
||
return clerk.__internal_openPlanDetails(planDetailsOptions); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto with the |
||
}); | ||
</script> | ||
panteliselef marked this conversation as resolved.
Show resolved
Hide resolved
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
--- | ||
import type { __experimental_SubscriptionDetailsButtonProps } from '@clerk/types'; | ||
|
||
import type { HTMLTag, Polymorphic } from 'astro/types'; | ||
import type { ButtonProps } from '../../types'; | ||
import { addUnstyledAttributeToFirstTag, logAsPropUsageDeprecation } from './utils'; | ||
|
||
type Props<Tag extends HTMLTag = 'button'> = Polymorphic<ButtonProps<Tag>> & | ||
Omit<__experimental_SubscriptionDetailsButtonProps, 'onSubscriptionCancel'> & { clickIdentifier?: string }; | ||
|
||
import { generateSafeId } from '@clerk/astro/internal'; | ||
|
||
const safeId = generateSafeId(); | ||
|
||
if ('as' in Astro.props) { | ||
logAsPropUsageDeprecation(); | ||
} | ||
|
||
const { as: Tag = 'button', asChild, for: _for, clickIdentifier, subscriptionDetailsProps, ...props } = Astro.props; | ||
|
||
const subscriptionDetailsOptions = { | ||
for: _for, | ||
clickIdentifier, | ||
...subscriptionDetailsProps, | ||
}; | ||
|
||
let htmlElement = ''; | ||
|
||
if (asChild) { | ||
htmlElement = await Astro.slots.render('default'); | ||
htmlElement = addUnstyledAttributeToFirstTag(htmlElement, safeId); | ||
} | ||
--- | ||
|
||
{ | ||
asChild ? ( | ||
<Fragment set:html={htmlElement} /> | ||
) : ( | ||
<Tag | ||
{...props} | ||
data-clerk-unstyled-id={safeId} | ||
> | ||
<slot>Subscription details</slot> | ||
</Tag> | ||
) | ||
} | ||
|
||
<script is:inline define:vars={{ props, subscriptionDetailsOptions, safeId }}> | ||
const btn = document.querySelector(`[data-clerk-unstyled-id="${safeId}"]`); | ||
|
||
btn.addEventListener('click', () => { | ||
const clerk = window.Clerk; | ||
|
||
// Authentication checks | ||
if (!clerk.user) { | ||
throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.'); | ||
} | ||
|
||
if (!clerk.organization && subscriptionDetailsOptions.for === 'organization') { | ||
throw new Error( | ||
'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.', | ||
); | ||
} | ||
if (subscriptionDetailsOptions.clickIdentifier) { | ||
const clickEvent = new CustomEvent('clerk:subscription-cancel', { | ||
detail: subscriptionDetailsOptions.clickIdentifier, | ||
}); | ||
subscriptionDetailsOptions.onSubscriptionCancel = () => { | ||
document.dispatchEvent(clickEvent); | ||
}; | ||
} | ||
|
||
return clerk.__internal_openSubscriptionDetails(subscriptionDetailsOptions); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we can't pass a function as prop here, the const customEvent = new CustomEvent('clerk:subscription-cancel');
clerk.__internal_openSubscriptionDetails({
...subscriptionDetailsOptions,
onSubscriptionCancel: () => document.dispatchEvent(customEvent),
}); and in the parent component, they can listen to it <script>
document.addEventListener('clerk:subscription-cancel', (e) => {
//...
})
</script> We do this pattern in our There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Handled here |
||
}); | ||
</script> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
import type { __experimental_CheckoutButtonProps } from '@clerk/types'; | ||
import React from 'react'; | ||
|
||
import type { WithClerkProp } from './utils'; | ||
import { assertSingleChild, normalizeWithDefaultValue, safeExecute, withClerk } from './utils'; | ||
|
||
export type { __experimental_CheckoutButtonProps as CheckoutButtonProps }; | ||
|
||
export const CheckoutButton = withClerk( | ||
({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => { | ||
const { | ||
planId, | ||
planPeriod, | ||
for: _for, | ||
onSubscriptionComplete, | ||
newSubscriptionRedirectUrl, | ||
checkoutProps, | ||
...rest | ||
} = props; | ||
|
||
// Note: Auth checks are moved to runtime since Astro React components | ||
// don't have access to auth context at render time like Vue/React apps do | ||
|
||
children = normalizeWithDefaultValue(children, 'Checkout'); | ||
const child = assertSingleChild(children)('CheckoutButton'); | ||
|
||
const clickHandler = () => { | ||
if (!clerk) { | ||
return; | ||
} | ||
|
||
return clerk.__internal_openCheckout({ | ||
planId, | ||
planPeriod, | ||
for: _for, | ||
onSubscriptionComplete, | ||
newSubscriptionRedirectUrl, | ||
...checkoutProps, | ||
}); | ||
}; | ||
|
||
const wrappedChildClickHandler: React.MouseEventHandler = e => { | ||
if (child && typeof child === 'object' && 'props' in child) { | ||
void safeExecute(child.props.onClick)(e); | ||
} | ||
return clickHandler(); | ||
}; | ||
|
||
const childProps = { ...rest, onClick: wrappedChildClickHandler }; | ||
return React.cloneElement(child as React.ReactElement<unknown>, childProps); | ||
}, | ||
'CheckoutButton', | ||
); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import type { __experimental_PlanDetailsButtonProps } from '@clerk/types'; | ||
import React from 'react'; | ||
|
||
import type { WithClerkProp } from './utils'; | ||
import { assertSingleChild, normalizeWithDefaultValue, safeExecute, withClerk } from './utils'; | ||
|
||
export type { __experimental_PlanDetailsButtonProps as PlanDetailsButtonProps }; | ||
|
||
export const PlanDetailsButton = withClerk( | ||
({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_PlanDetailsButtonProps>>) => { | ||
const { plan, planId, initialPlanPeriod, planDetailsProps, ...rest } = props; | ||
|
||
children = normalizeWithDefaultValue(children, 'Plan details'); | ||
const child = assertSingleChild(children)('PlanDetailsButton'); | ||
|
||
const clickHandler = () => { | ||
if (!clerk) { | ||
return; | ||
} | ||
|
||
return clerk.__internal_openPlanDetails({ | ||
plan, | ||
planId, | ||
initialPlanPeriod, | ||
...planDetailsProps, | ||
} as __experimental_PlanDetailsButtonProps); | ||
}; | ||
|
||
const wrappedChildClickHandler: React.MouseEventHandler = e => { | ||
if (child && typeof child === 'object' && 'props' in child) { | ||
void safeExecute(child.props.onClick)(e); | ||
} | ||
return clickHandler(); | ||
}; | ||
|
||
const childProps = { ...rest, onClick: wrappedChildClickHandler }; | ||
return React.cloneElement(child as React.ReactElement<unknown>, childProps); | ||
}, | ||
'PlanDetailsButton', | ||
); |
Uh oh!
There was an error while loading. Please reload this page.