Skip to content

Commit 76c85b0

Browse files
committed
Rename navigateToTask from navigateIfTaskExists
1 parent 80f64ba commit 76c85b0

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ import {
151151
Organization,
152152
Waitlist,
153153
} from './resources/internal';
154-
import { navigateToTask } from './sessionTasks';
154+
import { navigateIfTaskExists } from './sessionTasks';
155155
import { State } from './state';
156156
import { warnings } from './warnings';
157157

@@ -1822,7 +1822,7 @@ export class Clerk implements ClerkInterface {
18221822
};
18231823

18241824
const setActiveNavigate: SetActiveNavigate = async ({ session }) => {
1825-
await navigateToTask(session, {
1825+
await navigateIfTaskExists(session, {
18261826
baseUrl: displayConfig.signInUrl,
18271827
navigate: this.navigate,
18281828
});
@@ -2125,7 +2125,7 @@ export class Clerk implements ClerkInterface {
21252125
session: signInOrSignUp.createdSessionId,
21262126
redirectUrl,
21272127
navigate: async ({ session }) => {
2128-
await navigateToTask(session, {
2128+
await navigateIfTaskExists(session, {
21292129
baseUrl: displayConfig.signInUrl,
21302130
navigate: this.navigate,
21312131
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function buildTaskURL(task: SessionTask, opts: Pick<Parameters<typeof bui
2525
/**
2626
* @internal
2727
*/
28-
export function navigateToTask(
28+
export function navigateIfTaskExists(
2929
session: SessionResource,
3030
{
3131
navigate,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ const SessionTasksStart = () => {
2727
const currentTaskKey = clerk.session?.currentTask?.key;
2828
if (!currentTaskKey) return;
2929

30-
void navigate(
31-
clerk.__internal_getOption('taskUrls')?.[currentTaskKey] ??
32-
`./${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTaskKey]}`,
33-
);
30+
// TODO -> Fix navigation here
31+
void navigate(`./${INTERNAL_SESSION_TASK_ROUTE_BY_KEY[currentTaskKey]}`);
3432
}, 500);
3533
return () => clearTimeout(timeoutId);
3634
}, [navigate, clerk, redirectUrlComplete]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { isClerkRuntimeError, isUserLockedError } from '@clerk/shared/error';
22
import { useClerk } from '@clerk/shared/react';
33
import { useCallback, useEffect } from 'react';
44

5-
import { navigateToTask } from '@/core/sessionTasks';
5+
import { navigateIfTaskExists } from '@/core/sessionTasks';
66
import { useCardState } from '@/ui/elements/contexts';
77
import { useRouter } from '@/ui/router';
88
import { handleError } from '@/ui/utils/errorHandler';
@@ -36,7 +36,7 @@ function useHandleAuthenticateWithPasskey(onSecondFactor: () => Promise<unknown>
3636
session: res.createdSessionId,
3737
redirectUrl: afterSignInUrl,
3838
navigate: async ({ session }) => {
39-
await navigateToTask(session, {
39+
await navigateIfTaskExists(session, {
4040
baseUrl: signInUrl,
4141
navigate: navigate,
4242
});

packages/clerk-js/src/ui/components/UserButton/useMultisessionActions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useClerk } from '@clerk/shared/react';
22
import type { SignedInSessionResource, UserButtonProps, UserResource } from '@clerk/types';
33

4-
import { navigateToTask } from '@/core/sessionTasks';
4+
import { navigateIfTaskExists } from '@/core/sessionTasks';
55
import { useEnvironment } from '@/ui/contexts';
66
import { useCardState } from '@/ui/elements/contexts';
77
import { sleep } from '@/ui/utils/sleep';
@@ -77,7 +77,7 @@ export const useMultisessionActions = (opts: UseMultisessionActionsParams) => {
7777
session,
7878
redirectUrl: opts.afterSwitchSessionUrl,
7979
navigate: async ({ session }) => {
80-
await navigateToTask(session, {
80+
await navigateIfTaskExists(session, {
8181
baseUrl: opts.signInUrl ?? displayConfig.signInUrl,
8282
navigate,
8383
});

0 commit comments

Comments
 (0)