Skip to content

Commit 124ffcf

Browse files
Merge branch 'main' into fix/settings-search-shortcut-style
2 parents 36ccab4 + 02f4ce5 commit 124ffcf

3 files changed

Lines changed: 29 additions & 12 deletions

File tree

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

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

11-
it("omits the redirect override on packaged desktop", () => {
12-
expect(resolveClerkSignInProps("t3code://app/#/settings/general", true)).toEqual({});
11+
it("removes a Clerk virtual pathname and callback params while preserving the desktop route", () => {
12+
expect(
13+
resolveClerkSignInProps(
14+
"t3code://app/CLERK-ROUTER/VIRTUAL/sign-up?__clerk_status=complete#/settings/connections",
15+
true,
16+
),
17+
).toEqual({
18+
forceRedirectUrl: "t3code://app/#/settings/connections",
19+
signUpForceRedirectUrl: "t3code://app/#/settings/connections",
20+
});
1321
});
1422

15-
it("omits the redirect override on development desktop", () => {
16-
expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({});
23+
it("preserves a clean development desktop route", () => {
24+
expect(resolveClerkSignInProps("t3code-dev://app/#/settings/general", true)).toEqual({
25+
forceRedirectUrl: "t3code-dev://app/#/settings/general",
26+
signUpForceRedirectUrl: "t3code-dev://app/#/settings/general",
27+
});
1728
});
1829
});
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
export interface ClerkSignInProps {
22
forceRedirectUrl?: string;
3+
signUpForceRedirectUrl?: string;
34
}
45

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.
96
export function resolveClerkSignInProps(href: string, isElectron: boolean): ClerkSignInProps {
10-
if (isElectron) return {};
7+
if (isElectron) {
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+
13+
return {
14+
forceRedirectUrl: redirectUrl.toString(),
15+
signUpForceRedirectUrl: redirectUrl.toString(),
16+
};
17+
}
1118
return { forceRedirectUrl: href };
1219
}

‎apps/web/src/components/settings/ThemeSettings.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,8 @@ export function ThemeLibrary({
555555
<h3 className="text-sm font-medium tracking-[-0.005em] text-foreground">Themes</h3>
556556
<div className="flex flex-wrap items-center justify-end gap-3">
557557
<Button
558-
className="h-7 rounded-md border border-border/70 bg-muted/30 px-2 text-xs font-medium text-foreground shadow-none hover:bg-accent/40"
559558
size="xs"
560-
variant="ghost"
559+
variant="outline"
561560
onClick={() =>
562561
openThemeEditor({
563562
editingThemeId: null,
@@ -570,7 +569,7 @@ export function ThemeLibrary({
570569
<PlusIcon />
571570
Create theme
572571
</Button>
573-
<Button size="xs" variant="ghost" onClick={() => onImportOpenChange(true)}>
572+
<Button size="xs" variant="outline" onClick={() => onImportOpenChange(true)}>
574573
<UploadIcon />
575574
Import theme
576575
</Button>

0 commit comments

Comments
 (0)