fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into from
Jun 20, 2025
Merged

fix(clerk-js): Do not display organization list after creating organization throw tasks flow #6117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
27e3600
Do not display organization list for force-an-org without memberships
LauraBeatris Jun 13, 2025
264af78
Extract force-an-org flow to separate component
LauraBeatris Jun 13, 2025
c35c6ec
Add changeset
LauraBeatris Jun 13, 2025
0087719
Bump `clerk.js` max bundle size
LauraBeatris Jun 15, 2025
d51718a
Extract task flow to internal component instead of `OrganizationList`
LauraBeatris Jun 16, 2025
efa1b2d
Introduce separate pages and states
LauraBeatris Jun 17, 2025
2112714
Do not set transitive state on navigation
LauraBeatris Jun 18, 2025
190f402
Improve redirection logic
LauraBeatris Jun 18, 2025
a00c9f4
Simplify conditions to render UI on mount
LauraBeatris Jun 18, 2025
e01d4f5
fix: Revalidate auth state for Next.js server
LauraBeatris Jun 20, 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/common-mice-ring.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow
12 changes: 6 additions & 6 deletions packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "610.32kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
{ "path": "./dist/clerk.js", "maxSize": "612kB" },

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54

The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.

I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.

Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.

{ "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "110KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
{ "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
{ "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
]
}
24 changes: 21 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
};

public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
const session = await this.session?.reload();
/**
* Invalidate previously cache pages with auth state before navigating
*/
const onBeforeSetActive: SetActiveHook =
typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
? window.__unstable__onBeforeSetActive
: noop;
await onBeforeSetActive();

const session = this.session;
if (!session || !this.environment) {
return;
}
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

this.#setTransitiveState();

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined

It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:

CleanShot.2025-06-18.at.11.44.35.mp4


await tracker.track(async () => {
await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
});
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

this.#setAccessors(session);
this.#emit();

/**
* Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
* This ensures that any server-side logic depending on the session status (like middleware-based
* redirects or protected routes) correctly reflects the updated client authentication state.
*/
const onAfterSetActive: SetActiveHook =
typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
? window.__unstable__onAfterSetActive
: noop;
await onAfterSetActive();
};

public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down
13 changes: 10 additions & 3 deletions packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
skipInvitationScreen: boolean;
navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
onCancel?: () => void;
onComplete?: () => void;
flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
const card = useCardState();
const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
const sessionTasksContext = useContext(SessionTasksContext);

const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

void userMemberships.revalidate?.();

if (sessionTasksContext) {
await sessionTasksContext.nextTask();

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:

  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.

I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.

return;
}

if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
return completeFlow();
}
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
const completeFlow = () => {
// We are confident that lastCreatedOrganizationRef.current will never be null
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

props.onComplete?.();
};
Expand Down
7 changes: 2 additions & 5 deletions packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
const sessionTasksContext = useContext(SessionTasksContext);
return (
<>
{!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
>
<CreateOrganizationForm
flow='organizationList'
onComplete={sessionTasksContext?.nextTask}
startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
skipInvitationScreen={skipInvitationScreen}
navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
);
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
const environment = useEnvironment();

const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down
64 changes: 37 additions & 27 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext as SessionTasksContext,
useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
const clerk = useClerk();
const { navigate } = useRouter();
const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
<Card.Footer />
</Card.Root>
);
});
};

function SessionTaskRoutes(): JSX.Element {
return (
<Switch>
<Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
<OrganizationListContext.Provider
value={{
componentName: 'OrganizationList',
skipInvitationScreen: true,
}}
>
<OrganizationList />
</OrganizationListContext.Provider>
<ForceOrganizationSelectionTask />
</Route>
<Route index>
<SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
* @internal
*/
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

const redirectUrlComplete =
signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

// If there are no pending tasks, navigate away from the tasks flow.
// This handles cases where a user with an active session returns to the tasks URL,
// for example by using browser back navigation. Since there are no pending tasks,
// we redirect them to their intended destination.
useEffect(() => {
const task = clerk.session?.currentTask;
if (isNavigatingToTask) {
return;
}

if (!task) {
// Tasks can only exist on pending sessions, but we check both conditions
// here to be defensive and ensure proper redirection
const task = clerk.session?.currentTask;
if (!task || clerk.session?.status === 'active') {
void navigate(redirectUrlComplete);
return;
}

clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
}, [clerk, navigate, redirectUrlComplete]);
}, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.
const nextTask = useCallback(
() => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
[clerk, redirectUrlComplete],
);
const nextTask = useCallback(() => {
setIsNavigatingToTask(true);
return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
}, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.
if (!clerk.session?.currentTask) {
return (
<Card.Root>
<Card.Content>
<LoadingCardContainer />
</Card.Content>
<Card.Footer />
</Card.Root>
);
}

return (
<SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
<SessionTaskRoutes />
</SessionTasksContext.Provider>
);
}
});
116 changes: 116 additions & 0 deletions packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
* @internal
*/
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.
if (isLoading) {
return (
<FlowCard>
<FlowLoadingState />
</FlowCard>
);
}

if (hasData) {
return <OrganizationSelectionPage />;
}

return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

return (
<OrganizationListContext.Provider
value={{
componentName: 'OrganizationList',
skipInvitationScreen: true,
}}
>
<FlowCard>
{showCreateOrganizationForm ? (
<Box
sx={t => ({
padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
})}
>
<CreateOrganizationForm
flow='default'
startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
skipInvitationScreen
onCancel={() => setShowCreateOrganizationForm(false)}
/>
</Box>
) : (
<OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
)}
</FlowCard>
</OrganizationListContext.Provider>
);
};

const CreateOrganizationPage = () => {
return (
<FlowCard>
<Box
sx={t => ({
padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
})}
>
<CreateOrganizationForm
flow='default'
startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
skipInvitationScreen
/>
</Box>
</FlowCard>
);
};

const FlowCard = ({ children }: PropsWithChildren) => {
const card = useCardState();

return (
<Card.Root>
<Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:

image

Otherwise it'd stay like that:

image

<Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
{children}
</Card.Content>
<Card.Footer />
</Card.Root>
);
};

const FlowLoadingState = () => (
<Flex
direction='row'
center
sx={t => ({
height: '100%',
minHeight: t.sizes.$60,
})}
Comment on lines +105 to +108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.

Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.

>
<Spinner
size='xl'
colorScheme='primary'
elementDescriptor={descriptors.spinner}
/>
</Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.
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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

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
fix(clerk-js): Do not display organization list after creating organization throw tasks flow#6117

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 10 commits into

from

Jun 20, 2025
 Merged


fix(clerk-js): Do not display organization list after creating organization throw tasks flow
#6117
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
27e3600

Do not display organization list for force-an-org without memberships


LauraBeatris Jun 13, 2025
264af78

Extract force-an-org flow to separate component


LauraBeatris Jun 13, 2025
c35c6ec

Add changeset


LauraBeatris Jun 13, 2025
0087719

Bump `clerk.js` max bundle size


LauraBeatris Jun 15, 2025
d51718a

Extract task flow to internal component instead of `OrganizationList`


LauraBeatris Jun 16, 2025
efa1b2d

Introduce separate pages and states


LauraBeatris Jun 17, 2025
2112714

Do not set transitive state on navigation


LauraBeatris Jun 18, 2025
190f402

Improve redirection logic


LauraBeatris Jun 18, 2025
a00c9f4

Simplify conditions to render UI on mount


LauraBeatris Jun 18, 2025
e01d4f5

fix: Revalidate auth state for Next.js server


LauraBeatris Jun 20, 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/common-mice-ring.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Prevent organization list from displaying after creating an organization through the force organization selection flow

12 changes: 6 additions & 6 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "610.32kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "70.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "53.06KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "108.75KB" },
 { "path": "./dist/clerk.js", "maxSize": "612kB" },
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

CleanShot 2025-06-18 at 13 21 54
The bundle increased around 4KB since I extracted the force-an-org flow outside of OrganizationList. It increased the general bundle, but we are lazy loading SessionTasks within SignIn.
I think the tradeoff is worth considering. I didn't want to introduce another if (sessionTasksContext) within OrganizationList to hijack the logic in there, but rather keep it separate.
Ideally, would be nice to use Suspense to only download the necessary after-auth steps according to Enviroment settings.
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "110KB" },
 { "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "38KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand All@@ -25,6 +25,6 @@
 { "path": "./dist/paymentSources*.js", "maxSize": "9.17KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "1KB" }
 { "path": "./dist/sessionTasks*.js", "maxSize": "1.5KB" }
 ]
}

24 changes: 21 additions & 3 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1283,7 +1283,16 @@ export class Clerk implements ClerkInterface {
 };

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 const session = await this.session?.reload();
 /**
 * Invalidate previously cache pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
 ? window.__unstable__onBeforeSetActive
 : noop;
 await onBeforeSetActive();

 const session = this.session;
 if (!session || !this.environment) {
 return;
 }
Expand All@@ -1301,8 +1310,6 @@ export class Clerk implements ClerkInterface {
 const tracker = createBeforeUnloadTracker(this.#options.standardBrowser);
 const defaultRedirectUrlComplete = this.client?.signUp ? this.buildAfterSignUpUrl() : this.buildAfterSignInUrl();

 this.#setTransitiveState();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We do not need the transitive state here. It was causing the SignIn component to unmount due to withCoreSessionGuard that does not render its children when session === undefined
It makes sense when we're going from an empty session to an actual session, but since in this case we already have one, then I don't see the reason why to set a transitive state here.
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

Here you can see SignIn getting unmounted due to this.#setTransitiveState();:
CleanShot.2025-06-18.at.11.44.35.mp4

 await tracker.track(async () => {
 await this.navigate(redirectUrlComplete ?? defaultRedirectUrlComplete);
 });
Expand All@@ -1313,6 +1320,17 @@ export class Clerk implements ClerkInterface {

 this.#setAccessors(session);
 this.#emit();

 /**
 * Invoke the Next.js middleware to synchronize server and client state after resolving a session task.
 * This ensures that any server-side logic depending on the session status (like middleware-based
 * redirects or protected routes) correctly reflects the updated client authentication state.
 */
 const onAfterSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onAfterSetActive === 'function'
 ? window.__unstable__onAfterSetActive
 : noop;
 await onAfterSetActive();
 };

 public addListener = (listener: ListenerCallback): UnsubscribeCallback => {
Expand Down

13 changes: 10 additions & 3 deletions
packages/clerk-js/src/ui/components/CreateOrganization/CreateOrganizationForm.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { useOrganization, useOrganizationList } from '@clerk/shared/react';
import type { CreateOrganizationParams, OrganizationResource } from '@clerk/types';
import React from 'react';
import React, { useContext } from 'react';

import { SessionTasksContext } from '@/ui/contexts/components/SessionTasks';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Form } from '@/ui/elements/Form';
import { FormButtonContainer } from '@/ui/elements/FormButtons';
Expand All@@ -23,7 +24,7 @@ import { organizationListParams } from '../OrganizationSwitcher/utils';

type CreateOrganizationFormProps = {
 skipInvitationScreen: boolean;
 navigateAfterCreateOrganization: (organization: OrganizationResource) => Promise<unknown>;
 navigateAfterCreateOrganization?: (organization: OrganizationResource) => Promise<unknown>;
 onCancel?: () => void;
 onComplete?: () => void;
 flow: 'default' | 'organizationList';
Expand All@@ -37,6 +38,7 @@ type CreateOrganizationFormProps = {
export const CreateOrganizationForm = withCardStateProvider((props: CreateOrganizationFormProps) => {
 const card = useCardState();
 const wizard = useWizard({ onNextStep: () => card.setError(undefined) });
 const sessionTasksContext = useContext(SessionTasksContext);

 const lastCreatedOrganizationRef = React.useRef<OrganizationResource | null>(null);
 const { createOrganization, isLoaded, setActive, userMemberships } = useOrganizationList({
Expand DownExpand Up@@ -87,6 +89,11 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani

 void userMemberships.revalidate?.();

 if (sessionTasksContext) {
 await sessionTasksContext.nextTask();
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

This is a pretty similar order as we'd have for custom flows:
  1. Create an organization
  2. Update it to the active session
  3. Verify if there are remaining tasks, and if so, navigate to the next one.
I've moved it inside of here now instead of passing it within onComplete prop so that we can await for it. onComplete is a sync property and I don't think we should turn into a promise in order to avoid side effects.
 return;
 }

 if (props.skipInvitationScreen ?? organization.maxAllowedMemberships === 1) {
 return completeFlow();
 }
Expand All@@ -100,7 +107,7 @@ export const CreateOrganizationForm = withCardStateProvider((props: CreateOrgani
 const completeFlow = () => {
 // We are confident that lastCreatedOrganizationRef.current will never be null
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 void props.navigateAfterCreateOrganization(lastCreatedOrganizationRef.current!);
 void props.navigateAfterCreateOrganization?.(lastCreatedOrganizationRef.current!);

 props.onComplete?.();
 };
Expand Down

7 changes: 2 additions & 5 deletions
packages/clerk-js/src/ui/components/OrganizationList/OrganizationListPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { useOrganizationList, useUser } from '@clerk/shared/react';
import { useContext, useState } from 'react';
import { useState } from 'react';

import { Action, Actions } from '@/ui/elements/Actions';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment, useOrganizationListContext } from '../../contexts';
import { SessionTasksContext } from '../../contexts/components/SessionTasks';
import { Box, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables';
import { useInView } from '../../hooks';
import { Add } from '../../icons';
Expand DownExpand Up@@ -116,7 +115,6 @@ export const OrganizationListPage = withCardStateProvider(() => {
const OrganizationListFlows = ({ showListInitially }: { showListInitially: boolean }) => {
 const { navigateAfterCreateOrganization, skipInvitationScreen, hideSlug } = useOrganizationListContext();
 const [isCreateOrganizationFlow, setCreateOrganizationFlow] = useState(!showListInitially);
 const sessionTasksContext = useContext(SessionTasksContext);
 return (
 <>
 {!isCreateOrganizationFlow && (
Expand All@@ -131,7 +129,6 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 >
 <CreateOrganizationForm
 flow='organizationList'
 onComplete={sessionTasksContext?.nextTask}
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen={skipInvitationScreen}
 navigateAfterCreateOrganization={org =>
Expand All@@ -148,7 +145,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole
 );
};

const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
export const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => {
 const environment = useEnvironment();

 const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView();
Expand Down

64 changes: 37 additions & 27 deletions
packages/clerk-js/src/ui/components/SessionTasks/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionTask } from '@clerk/types';
import { useCallback, useContext, useEffect } from 'react';
import { useCallback, useContext, useEffect, useState } from 'react';

import { Card } from '@/ui/elements/Card';
import { withCardStateProvider } from '@/ui/elements/contexts';
import { LoadingCardContainer } from '@/ui/elements/LoadingCard';

import { SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { OrganizationListContext, SignInContext, SignUpContext } from '../../../ui/contexts';
import {
 SessionTasksContext as SessionTasksContext,
 useSessionTasksContext,
} from '../../contexts/components/SessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import { SessionTasksContext, useSessionTasksContext } from '../../contexts/components/SessionTasks';
import { Route, Switch, useRouter } from '../../router';
import { OrganizationList } from '../OrganizationList';
import { ForceOrganizationSelectionTask } from './tasks/ForceOrganizationSelection';

const SessionTasksStart = withCardStateProvider(() => {
const SessionTasksStart = () => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const { redirectUrlComplete } = useSessionTasksContext();
Expand All@@ -37,20 +33,13 @@ const SessionTasksStart = withCardStateProvider(() => {
 <Card.Footer />
 </Card.Root>
 );
});
};

function SessionTaskRoutes(): JSX.Element {
 return (
 <Switch>
 <Route path={SESSION_TASK_ROUTE_BY_KEY['org']}>
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <OrganizationList />
 </OrganizationListContext.Provider>
 <ForceOrganizationSelectionTask />
 </Route>
 <Route index>
 <SessionTasksStart />
Expand All@@ -62,34 +51,55 @@ function SessionTaskRoutes(): JSX.Element {
/**
 * @internal
 */
export function SessionTask(): JSX.Element {
export const SessionTask = withCardStateProvider(() => {
 const clerk = useClerk();
 const { navigate } = useRouter();
 const signInContext = useContext(SignInContext);
 const signUpContext = useContext(SignUpContext);
 const [isNavigatingToTask, setIsNavigatingToTask] = useState(false);

 const redirectUrlComplete =
 signInContext?.afterSignInUrl ?? signUpContext?.afterSignUpUrl ?? clerk?.buildAfterSignInUrl();

 // If there are no pending tasks, navigate away from the tasks flow.
 // This handles cases where a user with an active session returns to the tasks URL,
 // for example by using browser back navigation. Since there are no pending tasks,
 // we redirect them to their intended destination.
 useEffect(() => {
 const task = clerk.session?.currentTask;
 if (isNavigatingToTask) {
 return;
 }

 if (!task) {
 // Tasks can only exist on pending sessions, but we check both conditions
 // here to be defensive and ensure proper redirection
 const task = clerk.session?.currentTask;
 if (!task || clerk.session?.status === 'active') {
 void navigate(redirectUrlComplete);
 return;
 }

 clerk.telemetry?.record(eventComponentMounted('SessionTask', { task: task.key }));
 }, [clerk, navigate, redirectUrlComplete]);
 }, [clerk, navigate, isNavigatingToTask, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 const nextTask = useCallback(
 () => clerk.__experimental_navigateToTask({ redirectUrlComplete }),
 [clerk, redirectUrlComplete],
 );
 const nextTask = useCallback(() => {
 setIsNavigatingToTask(true);
 return clerk.__experimental_navigateToTask({ redirectUrlComplete }).finally(() => setIsNavigatingToTask(false));
 }, [clerk, redirectUrlComplete]);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (!clerk.session?.currentTask) {
 return (
 <Card.Root>
 <Card.Content>
 <LoadingCardContainer />
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
 }

 return (
 <SessionTasksContext.Provider value={{ nextTask, redirectUrlComplete }}>
 <SessionTaskRoutes />
 </SessionTasksContext.Provider>
 );
}
});

116 changes: 116 additions & 0 deletions
packages/clerk-js/src/ui/components/SessionTasks/tasks/ForceOrganizationSelection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
import { useOrganizationList } from '@clerk/shared/react/index';
import type { PropsWithChildren } from 'react';
import { useState } from 'react';

import { OrganizationListContext } from '@/ui/contexts';
import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';

import { Box, descriptors, Flex, localizationKeys, Spinner } from '../../../customizables';
import { CreateOrganizationForm } from '../../CreateOrganization/CreateOrganizationForm';
import { OrganizationListPageList } from '../../OrganizationList/OrganizationListPage';
import { organizationListParams } from '../../OrganizationSwitcher/utils';

/**
 * @internal
 */
export const ForceOrganizationSelectionTask = withCardStateProvider(() => {
 const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams);
 const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading;
 const hasData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count);

Comment thread
LauraBeatris marked this conversation as resolved.

 if (isLoading) {
 return (
 <FlowCard>
 <FlowLoadingState />
 </FlowCard>
 );
 }

 if (hasData) {
 return <OrganizationSelectionPage />;
 }

 return <CreateOrganizationPage />;
});

const OrganizationSelectionPage = () => {
 const [showCreateOrganizationForm, setShowCreateOrganizationForm] = useState(false);

 return (
 <OrganizationListContext.Provider
 value={{
 componentName: 'OrganizationList',
 skipInvitationScreen: true,
 }}
 >
 <FlowCard>
 {showCreateOrganizationForm ? (
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 onCancel={() => setShowCreateOrganizationForm(false)}
 />
 </Box>
 ) : (
 <OrganizationListPageList onCreateOrganizationClick={() => setShowCreateOrganizationForm(true)} />
 )}
 </FlowCard>
 </OrganizationListContext.Provider>
 );
};

const CreateOrganizationPage = () => {
 return (
 <FlowCard>
 <Box
 sx={t => ({
 padding: `${t.space.$none} ${t.space.$5} ${t.space.$5}`,
 })}
 >
 <CreateOrganizationForm
 flow='default'
 startPage={{ headerTitle: localizationKeys('organizationList.createOrganization') }}
 skipInvitationScreen
 />
 </Box>
 </FlowCard>
 );
};

const FlowCard = ({ children }: PropsWithChildren) => {
 const card = useCardState();

 return (
 <Card.Root>
 <Card.Content sx={t => ({ padding: `${t.space.$8} ${t.space.$none} ${t.space.$none}` })}>
@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We're resetting the padding on the boundaries in order to have the divider:
image
Otherwise it'd stay like that:
image
 <Card.Alert sx={t => ({ margin: `${t.space.$none} ${t.space.$5}` })}>{card.error}</Card.Alert>
 {children}
 </Card.Content>
 <Card.Footer />
 </Card.Root>
 );
};

const FlowLoadingState = () => (
 <Flex
 direction='row'
 center
 sx={t => ({
 height: '100%',
 minHeight: t.sizes.$60,
 })}

Comment on lines

+105
 to 
+108

@LauraBeatrisLauraBeatrisJun 18, 2025

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.

We need to set a min-height on the loading state while the create organization form isn't rendered.
Ideally, the loading container should have a similar height as the create organization form / organization list, however it's not possible to know ahead of time since we need to wait for the useOrganizationList query to finish.
 >
 <Spinner
 size='xl'
 colorScheme='primary'
 elementDescriptor={descriptors.spinner}
 />
 </Flex>
);
Comment thread
LauraBeatris marked this conversation as resolved.

Loading