Skip to content

fix(clerk-js): Do not allow setActive({ organization: null }) when organization selection is forced #6073

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
LauraBeatris merged 2 commits into from
Jun 9, 2025
Merged

fix(clerk-js): Do not allow setActive({ organization: null }) when organization selection is forced #6073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee8e62
Add guard for empty organization
LauraBeatris Jun 5, 2025
19999c2
Bump headless bundle size limit
LauraBeatris Jun 9, 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
5 changes: 5 additions & 0 deletions .changeset/petite-ravens-see.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Do not allow `setActive({ organization: null })` when organization selection is forced
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,10 @@ export class Clerk implements ClerkInterface {
);
}

if (organization === null && this.environment?.organizationSettings?.forceOrganizationSelection) {
throw new Error('setActive requires an organization parameter when organization selection is forced.');
}

const onBeforeSetActive: SetActiveHook =
typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
? window.__unstable__onBeforeSetActive
Expand Down
Loading