fix(web): preserve desktop route during Clerk auth (#5770)

Author: wobsoriano

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

@@ -8,11 +8,22 @@ describe("resolveClerkSignInProps", () => {
     expect(resolveClerkSignInProps(href, false)).toEqual({ forceRedirectUrl: href });
   });
 
-  it("omits the redirect override on packaged desktop", () => {
-    expect(resolveClerkSignInProps("t3code://app/#/settings/general", true)).toEqual({});
+  it("removes a Clerk virtual pathname and callback params while preserving the desktop route", () => {
+    expect(
+      resolveClerkSignInProps(
+        "t3code://app/CLERK-ROUTER/VIRTUAL/sign-up?__clerk_status=complete#/settings/connections",
+        true,
+      ),
+    ).toEqual({
+      forceRedirectUrl: "t3code://app/#/settings/connections",
+      signUpForceRedirectUrl: "t3code://app/#/settings/connections",
+    });
   });
 
-  it("omits the redirect override on development desktop", () => {
-    expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({});
+  it("preserves a clean development desktop route", () => {
+    expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({
+      forceRedirectUrl: "t3code-dev://app/#/settings/general",
+      signUpForceRedirectUrl: "t3code-dev://app/#/settings/general",
+    });
   });
 });

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

@@ -1,12 +1,19 @@
 export interface ClerkSignInProps {
   forceRedirectUrl?: string;
+  signUpForceRedirectUrl?: string;
 }
 
-// Clerk's native-app allowlist only authorizes the bare renderer root
-// (t3code://app/), which @clerk/electron's OAuth transport already supplies,
-// so any page-derived redirect override gets the whole sign-in request
-// rejected. On Electron, omit the override and let Clerk use its defaults.
 export function resolveClerkSignInProps(href: string, isElectron: boolean): ClerkSignInProps {
-  if (isElectron) return {};
+  if (isElectron) {
+    // Electron routes through the hash, so reset any Clerk virtual pathname without losing the T3 page.
+    const redirectUrl = new URL(href);
+    redirectUrl.pathname = "/";
+    redirectUrl.search = "";
+
+    return {
+      forceRedirectUrl: redirectUrl.toString(),
+      signUpForceRedirectUrl: redirectUrl.toString(),
+    };
+  }
   return { forceRedirectUrl: href };
 }