Skip to content

chore(ui): Guard ConfigureSSO based on active organization - #8613

Merged
LauraBeatris merged 4 commits into
mainfrom
laura/update-configuresso-to-work-with-orgs-only
May 25, 2026
Merged

chore(ui): Guard ConfigureSSO based on active organization#8613
LauraBeatris merged 4 commits into
mainfrom
laura/update-configuresso-to-work-with-orgs-only

Conversation

@LauraBeatris

@LauraBeatrisLauraBeatris commented May 21, 2026

Copy link
Copy Markdown
Contributor

Description

Resolves ORGS-1595

Do not allow <ConfigureSSO /> to be used if organizations are disabled or if the current organization session isn't active.

Screenshot 2026-05-25 at 18 46 53

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

@LauraBeatrisLauraBeatris self-assigned this May 21, 2026
@changeset-bot

changeset-botBot commented May 21, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: f4487f5

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 20 packages
NameType
@clerk/clerk-jsPatch
@clerk/sharedPatch
@clerk/chrome-extensionPatch
@clerk/expoPatch
@clerk/astroPatch
@clerk/backendPatch
@clerk/expo-passkeysPatch
@clerk/expressPatch
@clerk/fastifyPatch
@clerk/honoPatch
@clerk/localizationsPatch
@clerk/mswPatch
@clerk/nextjsPatch
@clerk/nuxtPatch
@clerk/react-routerPatch
@clerk/reactPatch
@clerk/tanstack-react-startPatch
@clerk/testingPatch
@clerk/uiPatch
@clerk/vuePatch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercelBot commented May 21, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

ProjectDeploymentActionsUpdated (UTC)
clerk-js-sandboxReadyReadyPreview, CommentMay 25, 2026 9:47pm

Request Review

@LauraBeatris
LauraBeatris requested a review from a teamMay 21, 2026 17:24
@LauraBeatris
LauraBeatris marked this pull request as ready for review May 21, 2026 17:24
@LauraBeatris
LauraBeatrisforce-pushed the laura/update-configuresso-to-work-with-orgs-only branch from 3b44ae7 to 75c901dCompareMay 21, 2026 17:24
@LauraBeatris
LauraBeatrisforce-pushed the laura/add-self-serve-sso-org-profile branch 5 times, most recently from 6f5a23a to d951d19CompareMay 21, 2026 17:44
@LauraBeatris
LauraBeatrisforce-pushed the laura/add-self-serve-sso-org-profile branch 2 times, most recently from 36ae016 to 6e345b0CompareMay 25, 2026 21:14
Base automatically changed from laura/add-self-serve-sso-org-profile to mainMay 25, 2026 21:22
@pkg-pr-new

pkg-pr-newBot commented May 25, 2026

Copy link
Copy Markdown

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8613

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8613

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8613

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8613

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8613

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8613

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8613

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8613

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8613

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8613

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8613

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8613

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8613

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8613

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8613

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8613

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8613

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8613

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8613

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8613

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8613

commit: f4487f5

@coderabbitai

coderabbitaiBot commented May 25, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 4e0e72f6-0da9-4668-badb-3754699f4cd7

📥 Commits

Reviewing files that changed from the base of the PR and between 64c9d22 and f4487f5.

📒 Files selected for processing (2)
  • packages/clerk-js/src/core/clerk.ts
  • packages/shared/src/internal/clerk-js/warnings.ts

📝 Walkthrough

Walkthrough

This PR gates ConfigureSSO behind the organizations environment setting by adding 'ConfigureSSO' as a caller for the enable flow, updating disabledSelfServeSSOFeature to check clerk.organization?.selfServeSSOEnabled, extending organization-related warnings to include ConfigureSSO, and modifying mountConfigureSSO to attempt enabling organizations, short-circuit when disabled, enforce a dev-time "user exists but no org" guard, and run existing feature checks afterwards.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

  • clerk/javascript#8600: Surfaces self-serve SSO configuration in OrganizationProfile and uses the updated disabledSelfServeSSOFeature guard to compute route visibility for ConfigureSSO.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title accurately and concisely describes the main change: guarding ConfigureSSO based on active organization status.
Description check✅ PassedThe description is directly related to the changeset, explaining the purpose of the changes and providing visual documentation of the error behavior.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Comment @coderabbitai help to get the list of available commands and usage tips.

@LauraBeatris
LauraBeatris merged commit 4d5027b into mainMay 25, 2026
45 checks passed
@LauraBeatris
LauraBeatris deleted the laura/update-configuresso-to-work-with-orgs-only branch May 25, 2026 22:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@LauraBeatris@iagodahlem