Remove SessionTasksContext from TaskChooseOrganization

LauraBeatris · LauraBeatris · commit b58ce9522078 · 2025-08-12T10:04:39.000-03:00
diff --git a/packages/clerk-js/src/core/sessionTasks.ts b/packages/clerk-js/src/core/sessionTasks.ts
@@ -13,7 +13,7 @@ export const INTERNAL_SESSION_TASK_ROUTE_BY_KEY: Record<SessionTask['key'], stri
 /**
  * @internal
  */
-export function buildTasksUrl(task: SessionTask, opts: Pick<Parameters<typeof buildURL>[0], 'base'>) {
+export function buildTaskUrl(task: SessionTask, opts: Pick<Parameters<typeof buildURL>[0], 'base'>) {
   const params = forwardClerkQueryParams();
 
   return buildURL(
@@ -44,7 +44,7 @@ export function navigateIfTaskExists(
     return;
   }
 
-  return navigate(buildTasksUrl(currentTask, { base: baseUrl }));
+  return navigate(buildTaskUrl(currentTask, { base: baseUrl }));
 }
 
 export function warnMissingPendingTaskHandlers(options: Record<string, unknown>) {
diff --git a/packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/ChooseOrganizationScreen.tsx b/packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/ChooseOrganizationScreen.tsx
@@ -2,7 +2,6 @@ import { useClerk, useOrganizationList, useUser } from '@clerk/shared/react';
 import type {
   OrganizationResource,
   OrganizationSuggestionResource,
-  SetActiveParams,
   UserOrganizationInvitationResource,
 } from '@clerk/types';
 import React, { useState } from 'react';
@@ -16,7 +15,7 @@ import {
   sharedMainIdentifierSx,
 } from '@/ui/common/organizations/OrganizationPreview';
 import { organizationListParams, populateCacheUpdateItem } from '@/ui/components/OrganizationSwitcher/utils';
-import { useSessionTasksContext } from '@/ui/contexts/components/SessionTasks';
+import { useTaskChooseOrganizationContext } from '@/ui/contexts/components/SessionTasks';
 import { Col, descriptors, localizationKeys, Text } from '@/ui/customizables';
 import { Action, Actions } from '@/ui/elements/Actions';
 import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
@@ -98,7 +97,7 @@ export const ChooseOrganizationScreen = withCardStateProvider(
 
 const MembershipPreview = withCardStateProvider((props: { organization: OrganizationResource }) => {
   const card = useCardState();
-  const { redirectUrlComplete, navigateOnSetActive } = useSessionTasksContext();
+  const { redirectUrlComplete } = useTaskChooseOrganizationContext();
   const { isLoaded, setActive } = useOrganizationList();
 
   if (!isLoaded) {
@@ -107,19 +106,10 @@ const MembershipPreview = withCardStateProvider((props: { organization: Organiza
 
   const handleOrganizationClicked = (organization: OrganizationResource) => {
     return card.runAsync(async () => {
-      const setActiveParams: SetActiveParams = {
+      await setActive({
         organization,
         redirectUrl: redirectUrlComplete,
-      };
-
-      // TODO - Add `onComplete` or `onNextTask` callbacks for `TaskChooseOrganization` standalone usage
-      if (navigateOnSetActive) {
-        setActiveParams.navigate = async ({ session }) => {
-          await navigateOnSetActive({ session, redirectUrl: redirectUrlComplete });
-        };
-      }
-
-      await setActive(setActiveParams);
+      });
     });
   };
 
diff --git a/packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/CreateOrganizationScreen.tsx b/packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskChooseOrganization/CreateOrganizationScreen.tsx
@@ -1,7 +1,6 @@
 import { useOrganizationList } from '@clerk/shared/react';
-import type { SetActiveParams } from '@clerk/types';
 
-import { useSessionTasksContext } from '@/ui/contexts/components/SessionTasks';
+import { useTaskChooseOrganizationContext } from '@/ui/contexts/components/SessionTasks';
 import { localizationKeys } from '@/ui/customizables';
 import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
 import { Form } from '@/ui/elements/Form';
@@ -20,7 +19,7 @@ type CreateOrganizationScreenProps = {
 
 export const CreateOrganizationScreen = withCardStateProvider((props: CreateOrganizationScreenProps) => {
   const card = useCardState();
-  const { redirectUrlComplete, navigateOnSetActive } = useSessionTasksContext();
+  const { redirectUrlComplete } = useTaskChooseOrganizationContext();
   const { createOrganization, isLoaded, setActive } = useOrganizationList({
     userMemberships: organizationListParams.userMemberships,
   });
@@ -46,19 +45,10 @@ export const CreateOrganizationScreen = withCardStateProvider((props: CreateOrga
     try {
       const organization = await createOrganization({ name: nameField.value, slug: slugField.value });
 
-      const setActiveParams: SetActiveParams = {
+      await setActive({
         organization,
         redirectUrl: redirectUrlComplete,
-      };
-
-      // TODO - Add `onComplete` or `onNextTask` callbacks for `TaskChooseOrganization` standalone usage
-      if (navigateOnSetActive) {
-        setActiveParams.navigate = async ({ session }) => {
-          await navigateOnSetActive({ session, redirectUrl: redirectUrlComplete });
-        };
-      }
-
-      await setActive(setActiveParams);
+      });
     } catch (err) {
       handleError(err, [nameField, slugField], card.setError);
     }
diff --git a/packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx b/packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx
@@ -26,7 +26,7 @@ import {
   UserVerificationContext,
   WaitlistContext,
 } from './components';
-import { SessionTasksContext, TaskChooseOrganizationContext } from './components/SessionTasks';
+import { TaskChooseOrganizationContext } from './components/SessionTasks';
 
 export function ComponentContextProvider({
   componentName,
@@ -115,9 +115,7 @@ export function ComponentContextProvider({
         <TaskChooseOrganizationContext.Provider
           value={{ componentName: 'TaskChooseOrganization', ...(props as TaskChooseOrganizationProps) }}
         >
-          <SessionTasksContext.Provider value={{ ...(props as TaskChooseOrganizationProps) }}>
-            {children}
-          </SessionTasksContext.Provider>
+          {children}
         </TaskChooseOrganizationContext.Provider>
       );
     default:
diff --git a/packages/clerk-js/src/ui/contexts/components/SignIn.ts b/packages/clerk-js/src/ui/contexts/components/SignIn.ts
@@ -3,7 +3,7 @@ import { isAbsoluteUrl } from '@clerk/shared/url';
 import type { SessionResource } from '@clerk/types';
 import { createContext, useContext, useMemo } from 'react';
 
-import { buildTasksUrl, INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '@/core/sessionTasks';
+import { buildTaskUrl, INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '@/core/sessionTasks';
 
 import { SIGN_IN_INITIAL_VALUE_KEYS } from '../../../core/constants';
 import { buildURL } from '../../../utils';
@@ -131,7 +131,7 @@ export const useSignInContext = (): SignInContextType => {
 
   const taskUrl = clerk.session?.currentTask
     ? (clerk.__internal_getOption('taskUrls')?.[clerk.session?.currentTask.key] ??
-      buildTasksUrl(clerk.session?.currentTask, { base: signInUrl }))
+      buildTaskUrl(clerk.session?.currentTask, { base: signInUrl }))
     : null;
 
   return {
diff --git a/packages/clerk-js/src/ui/contexts/components/SignUp.ts b/packages/clerk-js/src/ui/contexts/components/SignUp.ts
@@ -3,7 +3,7 @@ import { isAbsoluteUrl } from '@clerk/shared/url';
 import type { SessionResource } from '@clerk/types';
 import { createContext, useContext, useMemo } from 'react';
 
-import { buildTasksUrl, INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '@/core/sessionTasks';
+import { buildTaskUrl, INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '@/core/sessionTasks';
 
 import { SIGN_UP_INITIAL_VALUE_KEYS } from '../../../core/constants';
 import { buildURL } from '../../../utils';
@@ -126,7 +126,7 @@ export const useSignUpContext = (): SignUpContextType => {
 
   const taskUrl = clerk.session?.currentTask
     ? (clerk.__internal_getOption('taskUrls')?.[clerk.session?.currentTask.key] ??
-      buildTasksUrl(clerk.session?.currentTask, { base: signUpUrl }))
+      buildTaskUrl(clerk.session?.currentTask, { base: signUpUrl }))
     : null;
 
   return {
diff --git a/packages/clerk-js/src/ui/types.ts b/packages/clerk-js/src/ui/types.ts
@@ -137,7 +137,7 @@ export type CheckoutCtx = __internal_CheckoutProps & {
 export type SessionTasksCtx = {
   redirectUrlComplete: string;
   currentTaskContainer?: React.RefObject<HTMLDivElement> | null;
-  navigateOnSetActive?: (opts: { session: SessionResource; redirectUrl: string }) => Promise<unknown>;
+  navigateOnSetActive: (opts: { session: SessionResource; redirectUrl: string }) => Promise<unknown>;
 };
 
 export type TaskChooseOrganizationCtx = TaskChooseOrganizationProps & {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export const INTERNAL_SESSION_TASK_ROUTE_BY_KEY: Record<SessionTask['key'], stri`
`13`	`13`	`/**`
`14`	`14`	`* @internal`
`15`	`15`	`*/`
`16`		`-export function buildTasksUrl(task: SessionTask, opts: Pick<Parameters<typeof buildURL>[0], 'base'>) {`
	`16`	`+export function buildTaskUrl(task: SessionTask, opts: Pick<Parameters<typeof buildURL>[0], 'base'>) {`
`17`	`17`	`const params = forwardClerkQueryParams();`
`18`	`18`
`19`	`19`	`return buildURL(`
`@@ -44,7 +44,7 @@ export function navigateIfTaskExists(`
`44`	`44`	`return;`
`45`	`45`	`}`
`46`	`46`
`47`		`- return navigate(buildTasksUrl(currentTask, { base: baseUrl }));`
	`47`	`+ return navigate(buildTaskUrl(currentTask, { base: baseUrl }));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`export function warnMissingPendingTaskHandlers(options: Record<string, unknown>) {`