Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/mean-pumas-cut.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fix incorrect redirect when completing session tasks within `SignIn` and `SignUp` components
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-in.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
Expand Down
2 changes: 1 addition & 1 deletion integration/tests/session-tasks-sign-up.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
await u.page.waitForAppUrl('/page-protected');
});

test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
Expand Down
13 changes: 8 additions & 5 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@ import type {
SignUpRedirectOptions,
SignUpResource,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1595,7 +1596,7 @@ export class Clerk implements ClerkInterface {
return this.buildUrlWithAuth(this.environment.displayConfig.organizationProfileUrl);
}

public buildTasksUrl(): string {
public buildTasksUrl(options?: TasksRedirectOptions): string {
const currentTask = this.session?.currentTask;
if (!currentTask) {
return '';
Expand All@@ -1608,7 +1609,7 @@ export class Clerk implements ClerkInterface {

return buildURL(
{
base: this.buildSignInUrl(),
base: this.buildSignInUrl(options),
hashPath: getTaskEndpoint(currentTask),
},
{
Expand DownExpand Up@@ -1707,9 +1708,9 @@ export class Clerk implements ClerkInterface {
return;
};

public redirectToTasks = async (): Promise<unknown> => {
public redirectToTasks = async (options?: TasksRedirectOptions): Promise<unknown> => {
if (inBrowser()) {
return this.navigate(this.buildTasksUrl());
return this.navigate(this.buildTasksUrl(options));
}
return;
};
Expand DownExpand Up@@ -2044,7 +2045,9 @@ export class Clerk implements ClerkInterface {
}

if (this.session?.currentTask) {
await this.redirectToTasks();
await this.redirectToTasks({
redirectUrl: this.buildAfterSignInUrl(),
});
return;
}

Expand Down
14 changes: 6 additions & 8 deletions packages/clerk-js/src/ui/components/SessionTasks/index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { useClerk } from '@clerk/shared/react';
import { eventComponentMounted } from '@clerk/shared/telemetry';
import type { SessionResource } from '@clerk/types';
import { useContext, useEffect, useRef } from 'react';
import { useEffect, useRef } from 'react';

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

import { INTERNAL_SESSION_TASK_ROUTE_BY_KEY } from '../../../core/sessionTasks';
import { SignInContext, SignUpContext } from '../../../ui/contexts';
import {
SessionTasksContext,
TaskChooseOrganizationContext,
Expand DownExpand Up@@ -62,19 +61,18 @@ function SessionTasksRoutes(): JSX.Element {
);
}

type SessionTasksProps = {
redirectUrlComplete: string;
};

/**
* @internal
*/
export const SessionTasks = withCardStateProvider(() => {
export const SessionTasks = withCardStateProvider(({ redirectUrlComplete }: SessionTasksProps) => {
const clerk = useClerk();
const { navigate } = useRouter();
const signInContext = useContext(SignInContext);
const signUpContext = useContext(SignUpContext);
Comment thread
LauraBeatris marked this conversation as resolved.
const currentTaskContainer = useRef<HTMLDivElement>(null);

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,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui/components/SignIn/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,15 +136,15 @@ function SignInRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignUpUrl} />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially what I would do is create a new <SessionTaskProvider> and map/pass properties of signInContext and signUpContext and later simply consume it via a useSessionTaskContext()

</Route>
<Route index>
<LazySignUpStart />
</Route>
</Route>
)}
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signInContext.afterSignInUrl} />
</Route>
<Route index>
<SignInStart />
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/SignUp/index.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,7 +80,7 @@ function SignUpRoutes(): JSX.Element {
</Route>
</Route>
<Route path='tasks'>
<LazySessionTasks />
<LazySessionTasks redirectUrlComplete={signUpContext.afterSignUpUrl} />
</Route>
<Route index>
<SignUpStart />
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/controlComponents.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useSessionContext } from '../contexts/SessionContext';
import { useAuth } from '../hooks';
import { useAssertWrappedByClerkProvider } from '../hooks/useAssertWrappedByClerkProvider';
import type { RedirectToSignInProps, RedirectToSignUpProps, WithClerkProp } from '../types';
import type { RedirectToSignInProps, RedirectToSignUpProps, RedirectToTasksProps, WithClerkProp } from '../types';
import { withClerk } from './withClerk';

export const SignedIn = ({ children, treatPendingAsSignedOut }: React.PropsWithChildren<PendingSessionOptions>) => {
Expand DownExpand Up@@ -166,9 +166,9 @@ export const RedirectToSignUp = withClerk(({ clerk, ...props }: WithClerkProp<Re
return null;
}, 'RedirectToSignUp');

export const RedirectToTasks = withClerk(({ clerk}: WithClerkProp) => {
export const RedirectToTasks = withClerk(({ clerk, ...props }: WithClerkProp<RedirectToTasksProps>) => {
React.useEffect(() => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
}, []);

return null;
Expand Down
5 changes: 3 additions & 2 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ import type {
SignUpResource,
State,
TaskChooseOrganizationProps,
TasksRedirectOptions,
UnsubscribeCallback,
UserButtonProps,
UserProfileProps,
Expand DownExpand Up@@ -1276,8 +1277,8 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
}
};

redirectToTasks = async () => {
const callback = () => this.clerkjs?.redirectToTasks();
redirectToTasks = async (opts?: TasksRedirectOptions) => {
const callback = () => this.clerkjs?.redirectToTasks(opts);
if (this.clerkjs && this.loaded) {
return callback();
} else {
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import type {
RedirectUrlProp,
SignInRedirectOptions,
SignUpRedirectOptions,
TasksRedirectOptions,
Without,
} from '@clerk/types';
import type React from 'react';
Expand DownExpand Up@@ -116,6 +117,7 @@ export type SignInWithMetamaskButtonProps = {

export type RedirectToSignInProps = SignInRedirectOptions;
export type RedirectToSignUpProps = SignUpRedirectOptions;
export type RedirectToTasksProps = TasksRedirectOptions;
Comment thread
LauraBeatris marked this conversation as resolved.

type PageProps<T extends string> =
| {
Expand Down
6 changes: 5 additions & 1 deletion packages/types/src/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -769,8 +769,10 @@ export interface Clerk {

/**
* Redirects to the configured URL where tasks are mounted.
*
* @param opts A {@link RedirectOptions} object
*/
redirectToTasks(): Promise<unknown>;
redirectToTasks(opts?: TasksRedirectOptions): Promise<unknown>;

/**
* Completes a Google One Tap redirection flow started by
Expand DownExpand Up@@ -1162,6 +1164,8 @@ export type SignUpInitialValues = {
username?: string;
};

export type TasksRedirectOptions = RedirectOptions & RedirectUrlProp;

export type SignInRedirectOptions = RedirectOptions &
RedirectUrlProp & {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/vue/src/components/controlComponents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,9 +60,9 @@ export const RedirectToSignUp = defineComponent((props: RedirectOptions) => {
return () => null;
});

export const RedirectToTasks = defineComponent(() => {
export const RedirectToTasks = defineComponent((props: RedirectOptions) => {
useClerkLoaded(clerk => {
void clerk.redirectToTasks();
void clerk.redirectToTasks(props);
});

return () => null;
Expand Down
Loading