Skip to content

Commit 5bbb053

Browse files
authored
fix(clerk-js): Use authQueryString when building callback URLs (#4961)
1 parent 69734a2 commit 5bbb053

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.changeset/five-plants-sin.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
---
4+
5+
Fixes an issue where certain query parameters were not preserved during the SSO callback.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,20 @@ export const useSignInContext = (): SignInContextType => {
8282
signInUrl = buildURL({ base: signInUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
8383
signUpUrl = buildURL({ base: signUpUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
8484
waitlistUrl = buildURL({ base: waitlistUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
85+
86+
const authQueryString = redirectUrls.toSearchParams().toString();
87+
8588
const emailLinkRedirectUrl = buildRedirectUrl({
8689
routing: ctx.routing,
8790
baseUrl: signUpUrl,
88-
authQueryString: '',
91+
authQueryString,
8992
path: ctx.path,
9093
endpoint: isCombinedFlow ? '/create' + MAGIC_LINK_VERIFY_PATH_ROUTE : MAGIC_LINK_VERIFY_PATH_ROUTE,
9194
});
9295
const ssoCallbackUrl = buildRedirectUrl({
9396
routing: ctx.routing,
9497
baseUrl: signUpUrl,
95-
authQueryString: '',
98+
authQueryString,
9699
path: ctx.path,
97100
endpoint: isCombinedFlow ? '/create' + SSO_CALLBACK_PATH_ROUTE : SSO_CALLBACK_PATH_ROUTE,
98101
});
@@ -121,7 +124,7 @@ export const useSignInContext = (): SignInContextType => {
121124
signUpContinueUrl,
122125
queryParams,
123126
initialValues: { ...ctx.initialValues, ...initialValuesFromQueryParams },
124-
authQueryString: redirectUrls.toSearchParams().toString(),
127+
authQueryString,
125128
isCombinedFlow,
126129
};
127130
};

packages/clerk-js/src/ui/contexts/components/SignUp.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ export const useSignUpContext = (): SignUpContextType => {
7777
signUpUrl = buildURL({ base: signUpUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
7878
waitlistUrl = buildURL({ base: waitlistUrl, hashSearchParams: [queryParams, preservedParams] }, { stringify: true });
7979

80+
const authQueryString = redirectUrls.toSearchParams().toString();
81+
8082
const emailLinkRedirectUrl =
8183
ctx.emailLinkRedirectUrl ??
8284
buildRedirectUrl({
8385
routing: ctx.routing,
8486
baseUrl: signUpUrl,
85-
authQueryString: '',
87+
authQueryString,
8688
path: ctx.path,
8789
endpoint: isCombinedFlow ? '/create' + MAGIC_LINK_VERIFY_PATH_ROUTE : MAGIC_LINK_VERIFY_PATH_ROUTE,
8890
});
@@ -91,7 +93,7 @@ export const useSignUpContext = (): SignUpContextType => {
9193
buildRedirectUrl({
9294
routing: ctx.routing,
9395
baseUrl: signUpUrl,
94-
authQueryString: '',
96+
authQueryString,
9597
path: ctx.path,
9698
endpoint: isCombinedFlow ? '/create' + SSO_CALLBACK_PATH_ROUTE : SSO_CALLBACK_PATH_ROUTE,
9799
});
@@ -113,7 +115,7 @@ export const useSignUpContext = (): SignUpContextType => {
113115
navigateAfterSignUp,
114116
queryParams,
115117
initialValues: { ...ctx.initialValues, ...initialValuesFromQueryParams },
116-
authQueryString: redirectUrls.toSearchParams().toString(),
118+
authQueryString,
117119
isCombinedFlow,
118120
};
119121
};

0 commit comments

Comments
 (0)