Skip to content

Commit a70cd1a

Browse files
committed
fix(web): preserve desktop route during Clerk auth
1 parent 3301d07 commit a70cd1a

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

‎apps/web/src/components/clerk/authRedirect.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ describe("resolveClerkSignInProps", () => {
88
expect(resolveClerkSignInProps(href, false)).toEqual({ forceRedirectUrl: href });
99
});
1010

11-
it("returns to the renderer root on packaged desktop", () => {
11+
it("removes a Clerk virtual pathname and callback params while preserving the desktop route", () => {
1212
expect(
1313
resolveClerkSignInProps(
14-
"t3code://app/CLERK-ROUTER/VIRTUAL/sign-up#/settings/connections",
14+
"t3code://app/CLERK-ROUTER/VIRTUAL/sign-up?__clerk_status=complete#/settings/connections",
1515
true,
1616
),
1717
).toEqual({
18-
forceRedirectUrl: "t3code://app/",
19-
signUpForceRedirectUrl: "t3code://app/",
18+
forceRedirectUrl: "t3code://app/#/settings/connections",
19+
signUpForceRedirectUrl: "t3code://app/#/settings/connections",
2020
});
2121
});
2222

23-
it("returns to the renderer root on development desktop", () => {
23+
it("preserves a clean development desktop route", () => {
2424
expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({
25-
forceRedirectUrl: "t3code-dev://app/",
26-
signUpForceRedirectUrl: "t3code-dev://app/",
25+
forceRedirectUrl: "t3code-dev://app/#/settings/general",
26+
signUpForceRedirectUrl: "t3code-dev://app/#/settings/general",
2727
});
2828
});
2929
});

‎apps/web/src/components/clerk/authRedirect.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ export interface ClerkSignInProps {
55

66
export function resolveClerkSignInProps(href: string, isElectron: boolean): ClerkSignInProps {
77
if (isElectron) {
8-
// @clerk/electron supplies the authorized renderer root for OAuth callbacks, but Clerk's
9-
// modal can submit its virtual route as the completion redirect for sign-in or sign-up.
10-
const redirectUrl = new URL("/", href).toString();
8+
// Electron routes through the hash, so reset any Clerk virtual pathname without losing the T3 page.
9+
const redirectUrl = new URL(href);
10+
redirectUrl.pathname = "/";
11+
redirectUrl.search = "";
12+
1113
return {
12-
forceRedirectUrl: redirectUrl,
13-
signUpForceRedirectUrl: redirectUrl,
14+
forceRedirectUrl: redirectUrl.toString(),
15+
signUpForceRedirectUrl: redirectUrl.toString(),
1416
};
1517
}
1618
return { forceRedirectUrl: href };

0 commit comments

Comments
 (0)