chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
panteliselef merged 3 commits into from
Aug 22, 2025
Merged

chore(clerk-react,shared): Improve assertion error for requiring active organization #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3a9ff6
chore(clerk-react,shared): Improve assertion error for requiring acti…
panteliselef Aug 22, 2025
88e9b5d
align js doc comments
panteliselef Aug 22, 2025
06f76bf
add tests
panteliselef Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/plain-bottles-press.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.
10 changes: 6 additions & 4 deletions packages/react/src/components/CheckoutButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
* <CheckoutButton
* planId="plan_123"
* planPeriod="month"
* subscriberType="org"
* for="organization"
* onSubscriptionComplete={() => console.log('Subscription completed!')}
* >
* <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
* ```
*
* @throws {Error} When rendered outside of a `<SignedIn />` component
* @throws {Error} When `subscriberType="org"` is used without an active organization context
* @throws {Error} When `for="organization"` is used without an active organization context
*/
export const CheckoutButton = withClerk(
({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
const { userId, orgId } = useAuth();

if (userId === null) {
throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
}

if (orgId === null && _for === 'organization') {
throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
throw new Error(
'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
);
}

children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
});
};

const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning on line 89 in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation

GitHub Actions/ Static analysis

Promise-returning function provided to variable where a void return was expected
if (child && typeof child === 'object' && 'props' in child) {
await safeExecute(child.props.onClick)(e);
}
Expand Down
10 changes: 6 additions & 4 deletions packages/react/src/components/SubscriptionDetailsButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
* function OrganizationSubscriptionDetails() {
* return (
* <SubscriptionDetailsButton
* for="org"
* for="organization"
* onSubscriptionCancel={() => console.log('Subscription canceled')}
* >
* <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
* ```
*
* @throws {Error} When rendered outside of a `<SignedIn />` component
* @throws {Error} When `for="org"` is used without an active organization context
* @throws {Error} When `for="organization"` is used without an active organization context
*
* @see https://clerk.com/docs/billing/overview
*/
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
const { userId, orgId } = useAuth();

if (userId === null) {
throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
throw new Error(
'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
);
}

if (orgId === null && _for === 'organization') {
throw new Error(
'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
);
}

Expand Down
4 changes: 3 additions & 1 deletion packages/react/src/components/__tests__/CheckoutButton.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
for='organization'
/>,
),
).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
).toThrow(
'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
);
});

it('renders successfully with authenticated user', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

// Expect the component to throw an error when for="organization"
expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
);
});

Expand Down
4 changes: 3 additions & 1 deletion packages/shared/src/react/hooks/useCheckout.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
}

if (forOrganization === 'organization' && !organization) {
throw new Error('Clerk: Wrap your flow with a check for an active organization');
throw new Error(
'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
);
}

const manager = useMemo(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore(clerk-react,shared): Improve assertion error for requiring active organization#6606

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

panteliselef
merged 3 commits into

from

Aug 22, 2025
 Merged


chore(clerk-react,shared): Improve assertion error for requiring active organization
#6606
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b3a9ff6

chore(clerk-react,shared): Improve assertion error for requiring acti…


panteliselef Aug 22, 2025
88e9b5d

align js doc comments


panteliselef Aug 22, 2025
06f76bf

add tests


panteliselef Aug 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
.changeset/plain-bottles-press.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/clerk-react': patch
---

Improve assertion error for requiring active organization.

10 changes: 6 additions & 4 deletions
packages/react/src/components/CheckoutButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@
 * <CheckoutButton
 * planId="plan_123"
 * planPeriod="month"
 * subscriberType="org"
 * for="organization"
 * onSubscriptionComplete={() => console.log('Subscription completed!')}
 * >
 * <button className="custom-button">Subscribe Now</button>
Expand All@@ -42,7 +42,7 @@
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `subscriberType="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 */
export const CheckoutButton = withClerk(
 ({ clerk, children, ...props }: WithClerkProp<React.PropsWithChildren<__experimental_CheckoutButtonProps>>) => {
Expand All@@ -59,11 +59,13 @@
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error('Clerk: Ensure that `<CheckoutButton />` is rendered inside a `<SignedIn />` component.');
 }

 if (orgId === null && _for === 'organization') {
 throw new Error('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 throw new Error(
 'Clerk: Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 children = normalizeWithDefaultValue(children, 'Checkout');
Expand All@@ -84,7 +86,7 @@
 });
 };

 const wrappedChildClickHandler: React.MouseEventHandler = async e => {

Check warning
on line 89
in packages/react/src/components/CheckoutButton.tsx

View workflow job for this annotation
GitHub Actions/ Static analysis
Promise-returning function provided to variable where a void return was expected
 if (child && typeof child === 'object' && 'props' in child) {
 await safeExecute(child.props.onClick)(e);
 }
Expand Down

10 changes: 6 additions & 4 deletions
packages/react/src/components/SubscriptionDetailsButton.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import { withClerk } from './withClerk';
 * function OrganizationSubscriptionDetails() {
 * return (
 * <SubscriptionDetailsButton
 * for="org"
 * for="organization"
 * onSubscriptionCancel={() => console.log('Subscription canceled')}
 * >
 * <button>View Organization Subscription</button>
Expand All@@ -36,7 +36,7 @@ import { withClerk } from './withClerk';
 * ```
 *
 * @throws {Error} When rendered outside of a `<SignedIn />` component
 * @throws {Error} When `for="org"` is used without an active organization context
 * @throws {Error} When `for="organization"` is used without an active organization context
 *
 * @see https://clerk.com/docs/billing/overview
 */
Expand All@@ -53,12 +53,14 @@ export const SubscriptionDetailsButton = withClerk(
 const { userId, orgId } = useAuth();

 if (userId === null) {
 throw new Error('Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.');
 throw new Error(
 'Clerk: Ensure that `<SubscriptionDetailsButton />` is rendered inside a `<SignedIn />` component.',
 );
 }

 if (orgId === null && _for === 'organization') {
 throw new Error(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Clerk: Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

Expand Down

4 changes: 3 additions & 1 deletion
packages/react/src/components/__tests__/CheckoutButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@ describe('CheckoutButton', () => {
 for='organization'
 />,
 ),
 ).toThrow('Wrap `<CheckoutButton for="organization" />` with a check for an active organization.');
 ).toThrow(
 'Wrap `<CheckoutButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

 it('renders successfully with authenticated user', () => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/react/src/components/__tests__/SubscriptionDetailsButton.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ describe('SubscriptionDetailsButton', () => {

 // Expect the component to throw an error when for="organization"
 expect(() => render(<SubscriptionDetailsButton for='organization' />)).toThrow(
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization.',
 'Wrap `<SubscriptionDetailsButton for="organization" />` with a check for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined.',
 );
 });

Expand Down

4 changes: 3 additions & 1 deletion
packages/shared/src/react/hooks/useCheckout.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,9 @@ export const useCheckout = (options?: Params): __experimental_UseCheckoutReturn
 }

 if (forOrganization === 'organization' && !organization) {
 throw new Error('Clerk: Wrap your flow with a check for an active organization');
 throw new Error(
 'Clerk: Ensure your flow checks for an active organization. Retrieve `orgId` from `useAuth()` and confirm it is defined. For SSR, see: https://clerk.com/docs/references/backend/types/auth-object#how-to-access-the-auth-object',
 );
 }

 const manager = useMemo(
Expand Down
Loading