Fix mocking of signedInSessions

Author: LauraBeatris

packages/clerk-js/src/core/__tests__/clerk.test.ts

@@ -1503,7 +1503,7 @@ describe('Clerk singleton', () => {
       mockClientFetch.mockReturnValue(
         Promise.resolve({
           sessions: [mockSession],
-          signedInSessions: [],
+          signedInSessions: [mockSession],
           signIn: new SignIn(null),
           signUp: new SignUp({
             status: 'missing_requirements',
@@ -1543,7 +1543,7 @@ describe('Clerk singleton', () => {
       const mockSession = {
         id: sessionId,
         remove: jest.fn(),
-        status,
+        status: 'active',
         user: {},
         touch: jest.fn(() => Promise.resolve()),
         getToken: jest.fn(),
@@ -1564,7 +1564,7 @@ describe('Clerk singleton', () => {
       mockClientFetch.mockReturnValue(
         Promise.resolve({
           sessions: [mockSession],
-          signedInSessions: [],
+          signedInSessions: [mockSession],
           signIn: new SignIn(null),
           signUp: new SignUp({
             status: 'missing_requirements',

packages/clerk-js/src/core/sessionTasks.ts

@@ -49,13 +49,13 @@ export function warnMissingPendingTaskHandlers(options: Record<string, unknown>)
     keyof (Pick<SetActiveParams, 'navigate'> & Pick<ClerkOptions, 'taskUrls'>)
   >;
 
-  const hasAtLeastOneTaskOption = Object.keys(options).some(option => taskOptions.includes(option as any));
-  if (hasAtLeastOneTaskOption) {
+  const hasAtLeastOneOption = Object.keys(options).some(option => taskOptions.includes(option as any));
+  if (hasAtLeastOneOption) {
     return;
   }
 
   // TODO - Link to after-auth docs once it gets released
   logger.warnOnce(
-    `Clerk: Session has pending tasks but no handling is configured. To handle pending tasks automatically, provide either "taskUrls" for navigation to custom URLs or "navigate" for programmatic navigation. Without these options, users may get stuck on incomplete flows.`,
+    `Clerk: Session has pending tasks but no handling is configured. To handle pending tasks, provide either "taskUrls" for navigation to custom URLs or "navigate" for programmatic navigation. Without these options, users may get stuck on incomplete flows.`,
   );
 }

packages/clerk-js/src/ui/components/SessionTasks/index.tsx

@@ -107,12 +107,12 @@ export const SessionTasks = withCardStateProvider(() => {
   }
 
   const navigateOnSetActive = async ({ session }: { session: SessionResource }) => {
-    const currentTaskKey = session.currentTask?.key;
-    if (!currentTaskKey) {
+    const currentTask = session.currentTask;
+    if (!currentTask) {
       return navigate(redirectUrlComplete);
     }
 
-    return navigate(`./${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTaskKey]}`);
+    return navigate(`./${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTask.key]}`);
   };
 
   return (

packages/clerk-js/src/ui/contexts/components/SignIn.ts

@@ -121,12 +121,12 @@ export const useSignInContext = (): SignInContextType => {
   const signUpContinueUrl = buildURL({ base: signUpUrl, hashPath: '/continue' }, { stringify: true });
 
   const navigateOnSetActive = async ({ session, redirectUrl }: { session: SessionResource; redirectUrl: string }) => {
-    const currentTaskKey = session.currentTask?.key;
-    if (!currentTaskKey) {
+    const currentTask = session.currentTask;
+    if (!currentTask) {
       return navigate(redirectUrl);
     }
 
-    return navigate(`../tasks/${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTaskKey]}`);
+    return navigate(`../tasks/${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTask.key]}`);
   };
 
   const taskUrl = clerk.session?.currentTask

packages/clerk-js/src/ui/contexts/components/SignUp.ts

@@ -116,12 +116,12 @@ export const useSignUpContext = (): SignUpContextType => {
   const secondFactorUrl = buildURL({ base: signInUrl, hashPath: '/factor-two' }, { stringify: true });
 
   const navigateOnSetActive = async ({ session, redirectUrl }: { session: SessionResource; redirectUrl: string }) => {
-    const currentTaskKey = session.currentTask?.key;
-    if (!currentTaskKey) {
+    const currentTask = session.currentTask;
+    if (!currentTask) {
       return navigate(redirectUrl);
     }
 
-    return navigate(`../tasks/${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTaskKey]}`);
+    return navigate(`../tasks/${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTask.key]}`);
   };
 
   const taskUrl = clerk.session?.currentTask

packages/types/src/clerk.ts

@@ -950,7 +950,6 @@ type ClerkOptionsNavigation =
     };
 
 /**
- * A custom navigation function to be called just before the session and/or organization is set.
  * @inline
  */
 export type SetActiveNavigate = ({ session }: { session: SessionResource }) => Promise<unknown>;