Skip to content

fix(clerk-js): Use authQueryString when building callback URLs #4961

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
merged 2 commits into from
Jan 21, 2025
Merged

fix(clerk-js): Use authQueryString when building callback URLs #4961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde8e44
fix(clerk-js): Use authQueryString when building callback URLs
dstaley Jan 21, 2025
b0a3f83
chore(clerk-js): Add changeset
dstaley Jan 21, 2025
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/five-plants-sin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Fixes an issue where certain query parameters were not preserved during the SSO callback.
9 changes: 6 additions & 3 deletions packages/clerk-js/src/ui/contexts/components/SignIn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,20 @@ export const useSignInContext = (): SignInContextType => {
signInUrl = buildURL({ base: signInUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
signUpUrl = buildURL({ base: signUpUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
waitlistUrl = buildURL({ base: waitlistUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });

const authQueryString = redirectUrls.toSearchParams().toString();

const emailLinkRedirectUrl = buildRedirectUrl({
routing: ctx.routing,
baseUrl: signUpUrl,
authQueryString: '',
authQueryString,
path: ctx.path,
endpoint: isCombinedFlow ? '/create' + MAGIC_LINK_VERIFY_PATH_ROUTE : MAGIC_LINK_VERIFY_PATH_ROUTE,
});
const ssoCallbackUrl = buildRedirectUrl({
routing: ctx.routing,
baseUrl: signUpUrl,
authQueryString: '',
authQueryString,
path: ctx.path,
endpoint: isCombinedFlow ? '/create' + SSO_CALLBACK_PATH_ROUTE : SSO_CALLBACK_PATH_ROUTE,
});
Expand Down Expand Up @@ -121,7 +124,7 @@ export const useSignInContext = (): SignInContextType => {
signUpContinueUrl,
queryParams,
initialValues: { ...ctx.initialValues, ...initialValuesFromQueryParams },
authQueryString: redirectUrls.toSearchParams().toString(),
authQueryString,
isCombinedFlow,
};
};
8 changes: 5 additions & 3 deletions packages/clerk-js/src/ui/contexts/components/SignUp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@ export const useSignUpContext = (): SignUpContextType => {
signUpUrl = buildURL({ base: signUpUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
waitlistUrl = buildURL({ base: waitlistUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });

const authQueryString = redirectUrls.toSearchParams().toString();

const emailLinkRedirectUrl =
ctx.emailLinkRedirectUrl ??
buildRedirectUrl({
routing: ctx.routing,
baseUrl: signUpUrl,
authQueryString: '',
authQueryString,
path: ctx.path,
endpoint: isCombinedFlow ? '/create' + MAGIC_LINK_VERIFY_PATH_ROUTE : MAGIC_LINK_VERIFY_PATH_ROUTE,
});
Expand All @@ -91,7 +93,7 @@ export const useSignUpContext = (): SignUpContextType => {
buildRedirectUrl({
routing: ctx.routing,
baseUrl: signUpUrl,
authQueryString: '',
authQueryString,
path: ctx.path,
endpoint: isCombinedFlow ? '/create' + SSO_CALLBACK_PATH_ROUTE : SSO_CALLBACK_PATH_ROUTE,
});
Expand All @@ -113,7 +115,7 @@ export const useSignUpContext = (): SignUpContextType => {
navigateAfterSignUp,
queryParams,
initialValues: { ...ctx.initialValues, ...initialValuesFromQueryParams },
authQueryString: redirectUrls.toSearchParams().toString(),
authQueryString,
isCombinedFlow,
};
};
Loading