fix(desktop): restore T3 Connect sign-in (#4809)

Alex committed 3 months agov0.0.31-nightly.20260729.944

Commit 1b4830f1 parent 694f8d14 files · +40 −3Browse files

Unified · Split

4 files

@@ -0,0 +1,18 @@
	1	import { describe, expect, it } from "vite-plus/test";
	2
	3	import { resolveClerkSignInProps } from "./authRedirect";
	4
	5	describe("resolveClerkSignInProps", () => {
	6	it("returns to the current browser URL on the web", () => {
	7	const href = "https://app.t3.codes/connect?state=state-1#details";
	8	expect(resolveClerkSignInProps(href, false)).toEqual({ forceRedirectUrl: href });
	9	});
	10
	11	it("omits the redirect override on packaged desktop", () => {
	12	expect(resolveClerkSignInProps("t3code://app/#/settings/general", true)).toEqual({});
	13	});
	14
	15	it("omits the redirect override on development desktop", () => {
	16	expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({});
	17	});
	18	});

@@ -0,0 +1,12 @@
	1	export interface ClerkSignInProps {
	2	forceRedirectUrl?: string;
	3	}
	4
	5	// Clerk's native-app allowlist only authorizes the bare renderer root
	6	// (t3code://app/), which @clerk/electron's OAuth transport already supplies,
	7	// so any page-derived redirect override gets the whole sign-in request
	8	// rejected. On Electron, omit the override and let Clerk use its defaults.
	9	export function resolveClerkSignInProps(href: string, isElectron: boolean): ClerkSignInProps {
	10	if (isElectron) return {};
	11	return { forceRedirectUrl: href };
	12	}

 import { useClerk } from "@clerk/react";
+import { isElectron } from "../../env";
+import { resolveClerkSignInProps } from "./authRedirect";
 export function useT3ConnectAuthPrompt() {
   const clerk = useClerk();
   const openAuthPrompt = () => {
-    clerk.openSignIn({ forceRedirectUrl: window.location.href });
+    clerk.openSignIn(resolveClerkSignInProps(window.location.href, isElectron));
   };
   return { authPrompt: null, openAuthPrompt };
 }

   readConnectCliCallbackResult,
   rememberConnectCliAuthState,
 } from "../../cloud/connectCliAuth";
+import { isElectron } from "../../env";
 import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
 import { AuthSurfaceShell } from "../auth/AuthSurfaceShell";
+import { resolveClerkSignInProps } from "../clerk/authRedirect";
 import { Button } from "../ui/button";
 function ConnectCliAuthMessage({
     if (!isSignedIn) {
       if (!signInOpened.current) {
         signInOpened.current = true;
-        clerk.openSignIn({ forceRedirectUrl: window.location.href });
+        clerk.openSignIn(resolveClerkSignInProps(window.location.href, isElectron));
       }
       return;
     }
         <div className="mt-6">
           <Button
             type="button"
-            onClick={() => clerk.openSignIn({ forceRedirectUrl: window.location.href })}
+            onClick={() =>
+              clerk.openSignIn(resolveClerkSignInProps(window.location.href, isElectron))
+            }
           >
             Sign in
           </Button>