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
5 changes: 5 additions & 0 deletions .changeset/heavy-phones-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Use sigUpUrl from props / context / repo-level to construct a redirectUrl in sign-in from email-link flow.
2 changes: 1 addition & 1 deletion .changeset/tiny-beds-yell.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'@clerk/clerk-js': minor
---

Use signInUrl from props/ context / repo-level to construct a redirectUrl in email-link flow.
Use signInUrl from props / context / repo-level to construct a redirectUrl in sign-up from email-link flow.
13 changes: 9 additions & 4 deletions packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export type SignUpContextType = SignUpCtx & {
navigateAfterSignUp: () => any;
queryParams: ParsedQs;
signInUrl: string;
signUpUrl: string;
secondFactorUrl: string;
authQueryString: string | null;
};
Expand Down Expand Up @@ -83,17 +84,20 @@ export const useSignUpContext = (): SignUpContextType => {

const navigateAfterSignUp = () => navigate(afterSignUpUrl);

let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);

// Add query strings to the sign in URL
const authQs = buildAuthQueryString({
afterSignInUrl: afterSignInUrl,
afterSignUpUrl: afterSignUpUrl,
displayConfig: displayConfig,
});

// Todo: Look for a better way than checking virtual
if (authQs && ctx.routing != 'virtual') {
let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
if (authQs && ctx.routing !== 'virtual') {
signUpUrl += `#/?${authQs}`;
}

let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
if (authQs && ctx.routing !== 'virtual') {
signInUrl += `#/?${authQs}`;
}

Expand All @@ -104,6 +108,7 @@ export const useSignUpContext = (): SignUpContextType => {
...ctx,
componentName,
signInUrl,
signUpUrl,
secondFactorUrl,
afterSignUpUrl,
afterSignInUrl,
Expand Down