Skip to content

feat(elements): Add support for redirect_url URL parameter #3906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dstaley merged 1 commit into from
Aug 6, 2024
Merged

feat(elements): Add support for redirect_url URL parameter #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hungry-pianos-punch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@clerk/elements": patch
---

Add support for redirect_url URL parameter
13 changes: 9 additions & 4 deletions packages/elements/src/internals/machines/sign-in/router.machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export const SignInRouterMachine = setup({

const session = createdSessionId || lastActiveSessionId || null;

const beforeEmit = () => context.router?.push(context.clerk.buildAfterSignInUrl());
const beforeEmit = () =>
context.router?.push(context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignInUrl());
void context.clerk.setActive({ session, beforeEmit });

enqueue.raise({ type: 'RESET' }, { delay: 2000 }); // Reset machine after 2s delay.
Expand Down Expand Up @@ -186,7 +187,8 @@ export const SignInRouterMachine = setup({
? context.clerk.__unstable__environment?.displayConfig.signInUrl
: context.router?.basePath
}${SSO_CALLBACK_PATH_ROUTE}`,
redirectUrlComplete: context.clerk.buildAfterSignInUrl(),
redirectUrlComplete:
context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignInUrl(),
},
})),
},
Expand All @@ -201,7 +203,8 @@ export const SignInRouterMachine = setup({
? context.clerk.__unstable__environment?.displayConfig.signInUrl
: context.router?.basePath
}${SSO_CALLBACK_PATH_ROUTE}`,
redirectUrlComplete: context.clerk.buildAfterSignInUrl(),
redirectUrlComplete:
context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignInUrl(),
},
})),
},
Expand Down Expand Up @@ -284,7 +287,9 @@ export const SignInRouterMachine = setup({
log('Already logged in'),
{
type: 'navigateExternal',
params: ({ context }) => ({ path: context.clerk.buildAfterSignInUrl() }),
params: ({ context }) => ({
path: context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignInUrl(),
}),
},
],
},
Expand Down
13 changes: 9 additions & 4 deletions packages/elements/src/internals/machines/sign-up/router.machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ export const SignUpRouterMachine = setup({
(params?.useLastActiveSession && context.clerk.client.lastActiveSessionId) ||
((event as SignUpRouterNextEvent)?.resource || context.clerk.client.signUp).createdSessionId;

const beforeEmit = () => context.router?.push(context.clerk.buildAfterSignUpUrl());
const beforeEmit = () =>
context.router?.push(context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignUpUrl());
void context.clerk.setActive({ session, beforeEmit });
},
delayedReset: raise({ type: 'RESET' }, { delay: 3000 }), // Reset machine after 3s delay.
Expand Down Expand Up @@ -187,7 +188,8 @@ export const SignUpRouterMachine = setup({
? context.clerk.__unstable__environment?.displayConfig.signUpUrl
: context.router?.basePath
}${SSO_CALLBACK_PATH_ROUTE}`,
redirectUrlComplete: context.clerk.buildAfterSignUpUrl(),
redirectUrlComplete:
context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignUpUrl(),
},
})),
},
Expand All @@ -202,7 +204,8 @@ export const SignUpRouterMachine = setup({
? context.clerk.__unstable__environment?.displayConfig.signUpUrl
: context.router?.basePath
}${SSO_CALLBACK_PATH_ROUTE}`,
redirectUrlComplete: context.clerk.buildAfterSignUpUrl(),
redirectUrlComplete:
context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignUpUrl(),
},
})),
},
Expand Down Expand Up @@ -273,7 +276,9 @@ export const SignUpRouterMachine = setup({
log('Already logged in'),
{
type: 'navigateExternal',
params: ({ context }) => ({ path: context.clerk.buildAfterSignUpUrl() }),
params: ({ context }) => ({
path: context.router?.searchParams().get('redirect_url') || context.clerk.buildAfterSignUpUrl(),
}),
},
],
},
Expand Down