fix(clerk-js): Do not switch after-auth screens on org invites revalidation

[LauraBeatris]

Description

This PR introduces a fix to prevent after-auth screens from the "org" task from switching when organization data is revalidated, such as when invitations are accepted.

Once the invitation gets accepted, the component is re-rendered and shows the create organization form. Instead, we want to allow the user to take the invite and then click on it.

Previously:

with.sso.and.org.invite.-.bug.mp4

With bug fix:

CleanShot.2025-06-25.at.12.22.36.mp4

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:

Summary by CodeRabbit

• Bug Fixes
  • Improved the post-authentication flow to prevent the "create organization" form from appearing after accepting an organization invitation.
  • Enhanced UI stability by preventing unwanted screen transitions and flickering when selecting or creating an organization.

[changeset-bot]

🦋 Changeset detected

Latest commit: 59c5b1f

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

This PR includes changesets to release 3 packages

Name	Type
@clerk/clerk-js	Patch
@clerk/chrome-extension	Patch
@clerk/clerk-expo	Patch

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]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
clerk-js-sandbox	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jun 25, 2025 4:22pm

[coderabbitai]

📝 Walkthrough

## Walkthrough

This change updates the after-authentication flow in the '@clerk/clerk-js' package to prevent the "create organization" form from appearing after a user accepts an organization invitation. The `ForceOrganizationSelectionTask` component now uses a `useRef` hook named `currentFlow` to track whether the user is in the "create-organization" or "organization-selection" flow. This ref is passed to both the `OrganizationSelectionPage` and `CreateOrganizationPage` components, which update it via a `useEffect` hook to ensure consistent UI rendering. The logic ensures that once the organization selection page is shown, it remains visible even if data changes, avoiding unwanted UI transitions.

## Possibly related PRs

- clerk/javascript#6117: Modifies the organization selection and creation flow in `@clerk/clerk-js`, addressing UI behavior after organization creation to prevent unwanted screen flickering or transitions by controlling component rendering.

## Suggested reviewers

- aeliox
- wobsoriano

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7e5ee4d and 59c5b1f.

📒 Files selected for processing (2)

• .changeset/warm-parents-take.md (1 hunks)
• packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx (4 hunks)

🚧 Files skipped from review as they are similar to previous changes (2)

• packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx
• .changeset/warm-parents-take.md

⏰ Context from checks skipped due to timeout of 90000ms (5)

• GitHub Check: semgrep-cloud-platform/scan
• GitHub Check: Formatting | Dedupe | Changeset
• GitHub Check: Build Packages
• GitHub Check: semgrep/ci
• GitHub Check: Analyze (javascript-typescript)

---

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[pkg-pr-new]

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@6191

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/dev-cli

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

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@6191

@clerk/clerk-expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/clerk-react

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

@clerk/react-router

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

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@6191

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@6191

@clerk/types

npm i https://pkg.pr.new/@clerk/types@6191

@clerk/upgrade

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

@clerk/vue

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

commit: 59c5b1f