Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(clerk-js, chrome-extension): Hide stripe.js dependant flows from UP and OP by panteliselef · Pull Request #6754 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/great-adults-nail.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/chrome-extension': patch
---

Hide flows inside UserProfile and OrganizationProfile that depend on Stripe.js when remotely hosted code is not permitted.
1 change: 1 addition & 0 deletions packages/clerk-js/jest.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ const config = {
__PKG_NAME__: '@clerk/clerk-js',
__PKG_VERSION__: 'test',
__BUILD_VARIANT_CHIPS__: false,
__BUILD_DISABLE_RHC__: false,
},

testEnvironment: '<rootDir>/jest.jsdom-with-timezone.ts',
Expand Down
44 changes: 24 additions & 20 deletions packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ const CheckoutFormElements = () => {
const { data: paymentSources } = usePaymentMethods();

const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>
paymentSources.length > 0 ? 'existing' : 'new',
paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',
);
Comment on lines 193 to 195

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

Avoid “dead-end” checkout when RHC is disabled and there are no payment sources.

With __BUILD_DISABLE_RHC__ true, state initializes to 'existing'. If paymentSources.length === 0, users can't add a method and the submit path will likely fail (empty payment_source_id). Provide an empty-state/fallback or disable the submit path.

Minimal in-scope guard (render a localized notice instead of a broken form):

- const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>- paymentSources.length > 0 || __BUILD_DISABLE_RHC__ ? 'existing' : 'new',- );+ const [paymentMethodSource, setPaymentMethodSource] = useState<PaymentMethodSource>(() =>+ (paymentSources.length > 0 || __BUILD_DISABLE_RHC__) ? 'existing' : 'new',+ );

And adjust rendering (below, see 231–239 diff) to show an empty-state when __BUILD_DISABLE_RHC__ && paymentSources.length === 0.

Additionally, make paymentSourceId optional on submit so free-trial/zero-due flows don’t break:

// outside changed range: lines 162–171constpayWithExistingPaymentSource=(e: React.FormEvent<HTMLFormElement>)=>{e.preventDefault();constdata=newFormData(e.currentTarget);constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {},);};

If ConfirmCheckoutParams requires a discriminator, please confirm and adapt accordingly.


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"FILE: $target"echo"---- full file (numbered) ----"
nl -ba "$target"| sed -n '1,400p'echo"---- context lines 160-260 ----"
nl -ba "$target"| sed -n '160,260p'echo"---- repo-wide grep for related symbols ----"
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||true

Length of output: 140


🏁 Script executed:

#!/bin/bashset -euo pipefail
target="packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx"if [ !-f"$target" ];thenecho"MISSING: $target"exit 0
fiecho"=== head (1-240) ==="
sed -n '1,240p'"$target"echoecho"=== context (160-260) ==="
sed -n '160,260p'"$target"echoecho"=== repo-wide search for related symbols ==="ifcommand -v rg >/dev/null 2>&1;then
rg -n "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource"||trueelse
grep -nR --exclude-dir=node_modules -E "__BUILD_DISABLE_RHC__|paymentSources|payment_source_id|confirmCheckout|ConfirmCheckoutParams|payWithExistingPaymentSource".||truefi

Length of output: 28472


Fix dead-end checkout when RHC is disabled and no payment sources

  • Render an explicit empty-state / disable submit when BUILD_DISABLE_RHC && paymentSources.length === 0 so users aren’t stuck on the “existing” path. (packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx — CheckoutFormElements; state init ~lines 193–195; segmented-control/rendering ~lines 207–239)

  • Make payWithExistingPaymentSource tolerate a missing payment_source_id before calling confirm:

constpaymentSourceId=data.get('payment_source_id')asstring|null;returnconfirmCheckout(paymentSourceId ? { paymentSourceId } : {});

(location: payWithExistingPaymentSource, ~lines 162–171). ConfirmCheckoutParams accepts optional fields; passing {} is safe.

🤖 Prompt for AI Agents
In packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx around lines
193–195 and the segmented-control/rendering block ~207–239, currently state
initializes paymentMethodSource to "existing" when __BUILD_DISABLE_RHC__ is true
even if paymentSources.length === 0 which leads to a dead-end; change the render
path to show an explicit empty state or disable the submit control when
__BUILD_DISABLE_RHC__ && paymentSources.length === 0 so users cannot select the
non-existent "existing" path (update the JSX for CheckoutFormElements to render
a disabled submit or an empty-state message and prevent choosing the existing
option). Also update payWithExistingPaymentSource (~lines 162–171) to tolerate a
missing payment_source_id by reading it as string | null and calling
confirmCheckout with an empty object when absent (i.e., if paymentSourceId is
present pass { paymentSourceId } else pass {}), since ConfirmCheckoutParams
accepts optional fields.


if (!id) {
Expand All@@ -204,24 +204,28 @@ const CheckoutFormElements = () => {
gap={4}
sx={t => ({ padding: t.space.$4 })}
>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
{__BUILD_DISABLE_RHC__ ? null : (

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I consider introducing a <RHCSafe/> component but this impacts dead code elimination negatively.

<>
{/* only show if there are payment sources and there is a total due now */}
{paymentSources.length > 0 && (totals.totalDueNow.amount > 0 || !!freeTrialEndsAt) && (
<SegmentedControl.Root
aria-label='Payment method source'
value={paymentMethodSource}
onChange={value => setPaymentMethodSource(value as PaymentMethodSource)}
size='lg'
fullWidth
>
<SegmentedControl.Button
value='existing'
text={localizationKeys('commerce.paymentMethods')}
/>
<SegmentedControl.Button
value='new'
text={localizationKeys('commerce.addPaymentMethod')}
/>
</SegmentedControl.Root>
)}
</>
)}
Comment thread
panteliselef marked this conversation as resolved.

{paymentMethodSource === 'existing' && (
Expand All@@ -231,7 +235,7 @@ const CheckoutFormElements = () => {
/>
)}

{paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
{__BUILD_DISABLE_RHC__ ? null : paymentMethodSource === 'new' && <AddPaymentSourceForCheckout />}
</Col>
);
};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,6 +121,10 @@ export const PaymentSources = withCardStateProvider(() => {
return null;
}

if (__BUILD_DISABLE_RHC__ && sortedPaymentSources.length === 0) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
Expand DownExpand Up@@ -162,17 +166,21 @@ export const PaymentSources = withCardStateProvider(() => {
</Action.Open>
</Fragment>
))}
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
{__BUILD_DISABLE_RHC__ ? null : (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='paymentSources'
localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<AddScreen onSuccess={revalidatePaymentMethods} />
</Action.Card>
</Action.Open>
</>
)}
</>
)}
</ProfileSection.ItemList>
Expand Down
Loading