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
10 changes: 5 additions & 5 deletions packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,13 @@ export function _SignInStart(): JSX.Element {
}

if (clerkStatus === 'sign_up') {
const paramsToForward = new URLSearchParams();
if (organizationTicket) {
paramsToForward.set('__clerk_ticket', organizationTicket);
}
// We explicitly navigate to 'create' in the combined flow to trigger a client-side navigation. Navigating to
// signUpUrl triggers a full page reload when used with the hash router.
navigate(isCombinedFlow ? 'create' : signUpUrl);
void navigate(isCombinedFlow ? `create` : signUpUrl, { searchParams: paramsToForward });
return;
}

Expand Down Expand Up @@ -374,10 +378,6 @@ export function _SignInStart(): JSX.Element {
}

clerk.client.signUp[attribute] = identifierField.value;
const paramsToForward = new URLSearchParams();
if (organizationTicket) {
paramsToForward.set('__clerk_ticket', organizationTicket);
}

const redirectUrl = buildSSOCallbackURL(ctx, displayConfig.signUpUrl);
const redirectUrlComplete = ctx.afterSignUpUrl || '/';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { LoadedClerk, SignUpModes, SignUpResource } from '@clerk/types';

import { SIGN_UP_MODES } from '../../../core/constants';
import type { RouteContextValue } from '../../router/RouteContext';
import { completeSignUpFlow } from '../SignUp/util';

type HandleCombinedFlowTransferProps = {
identifierAttribute: 'emailAddress' | 'phoneNumber' | 'username';
identifierValue: string;
signUpMode: SignUpModes;
navigate: (to: string) => Promise<unknown>;
navigate: RouteContextValue['navigate'];
organizationTicket?: string;
afterSignUpUrl: string;
clerk: LoadedClerk;
Expand Down Expand Up @@ -78,7 +79,7 @@ export function handleCombinedFlowTransfer({
.catch(err => handleError(err));
}

return navigate(`create?${paramsToForward.toString()}`);
return navigate(`create`, { searchParams: paramsToForward });
}

function hasOptionalFields(signUp: SignUpResource) {
Expand Down
9 changes: 6 additions & 3 deletions packages/clerk-js/src/ui/router/Route.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ export function Route(props: RouteProps): JSX.Element | null {

const [indexPath, fullPath] = newPaths(router.indexPath, router.fullPath, props.path, props.index);

const resolve = (to: string) => {
const resolve = (to: string, { searchParams }: { searchParams?: URLSearchParams } = {}) => {
const url = new URL(to, window.location.origin + fullPath + '/');
if (searchParams) {
url.search = searchParams.toString();
}
url.pathname = trimTrailingSlash(url.pathname);
return url;
};
Expand Down Expand Up @@ -109,8 +112,8 @@ export function Route(props: RouteProps): JSX.Element | null {
return newGetMatchData(path, index) ? true : false;
},
resolve: resolve,
navigate: (to: string) => {
const toURL = resolve(to);
navigate: (to: string, { searchParams } = {}) => {
const toURL = resolve(to, { searchParams });
return router.baseNavigate(toURL);
},
refresh: router.refresh,
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/router/RouteContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface RouteContextValue {
currentPath: string;
matches: (path?: string, index?: boolean) => boolean;
baseNavigate: (toURL: URL) => Promise<unknown>;
navigate: (to: string) => Promise<unknown>;
navigate: (to: string, options?: { searchParams?: URLSearchParams }) => Promise<unknown>;
resolve: (to: string) => URL;
refresh: () => void;
params: { [key: string]: string };
Expand Down
Loading