Skip to content

Commit 1219f62

Browse files
fix(web): T3 Connect sign-in offers Retry after Clerk fails to load (#23620)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 5df5b44 commit 1219f62

8 files changed

Lines changed: 79 additions & 6 deletions

File tree

‎apps/web/src/components/HostedEmptyState.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { isElectron } from "../env";
1010
import { isLocalEnvironmentDisabled } from "../localEnvironment";
1111
import { useRelayEnvironmentDiscovery } from "../state/environments";
1212
import { InstallT3Commands } from "./InstallT3Commands";
13+
import { retryClerkLoad, useClerkLoadFailed } from "./clerk/clerkLoadFailure";
1314
import { useT3ConnectAuthPrompt } from "./clerk/useT3ConnectAuthPrompt";
1415
import { CloudEnvironmentConnectRows } from "./cloud/CloudEnvironmentConnectList";
1516
import { Button } from "./ui/button";
@@ -65,6 +66,7 @@ export function HostedEmptyState() {
6566

6667
function T3ConnectSteps() {
6768
const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
69+
const loadFailed = useClerkLoadFailed();
6870
const { openAuthPrompt } = useT3ConnectAuthPrompt();
6971
// Adding the first computer unmounts this screen. Wait for all health checks
7072
// so every compatible registration is queued before that happens.
@@ -76,7 +78,11 @@ function T3ConnectSteps() {
7678
return (
7779
<>
7880
<SetupStep number={1}>
79-
{isSignedIn ? (
81+
{loadFailed ? (
82+
<Button size="sm" onClick={retryClerkLoad}>
83+
Retry sign-in
84+
</Button>
85+
) : isSignedIn ? (
8086
<p className="flex items-center gap-1.5 text-muted-foreground">
8187
<CheckIcon className="size-4" />
8288
Signed in

‎apps/web/src/components/auth/ApproveAgentSurface.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { type ReactNode, useEffect, useEffectEvent, useRef, useState } from "rea
1313
import { isElectron } from "../../env";
1414
import { runConnectMcpApproval } from "../../state/connectMcpApproval";
1515
import { resolveClerkSignInProps } from "../clerk/authRedirect";
16+
import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
1617
import { Button } from "../ui/button";
1718
import { Spinner } from "../ui/spinner";
1819
import { StandalonePage, StandalonePageHeader } from "../ui/standalone-page";
@@ -86,6 +87,7 @@ export function ApproveAgentSurface() {
8687
);
8788
const clerk = useClerk();
8889
const { isLoaded, isSignedIn } = useAuth();
90+
const loadFailed = useClerkLoadFailed();
8991
const session = useAtomValue(managedRelaySessionAtom);
9092
const signInOpened = useRef(false);
9193

@@ -118,6 +120,21 @@ export function ApproveAgentSurface() {
118120
);
119121
}
120122

123+
if (loadFailed) {
124+
return (
125+
<Message
126+
title="Could not load sign-in"
127+
description="T3 Connect sign-in did not load. Check your connection, then try again."
128+
>
129+
<div className="mt-6">
130+
<Button type="button" onClick={retryClerkLoad}>
131+
Retry sign-in
132+
</Button>
133+
</div>
134+
</Message>
135+
);
136+
}
137+
121138
if (!isLoaded || (isSignedIn && session === null)) {
122139
return (
123140
<StandalonePage>

‎apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { UserButton, useAuth } from "@clerk/react";
2-
import { LogInIcon } from "lucide-react";
2+
import { LogInIcon, RotateCwIcon } from "lucide-react";
33

44
import { hasCloudPublicConfig } from "../../cloud/publicConfig";
55
import { SidebarMenu, SidebarMenuButton, SidebarMenuItem } from "../ui/sidebar";
6+
import { retryClerkLoad, useClerkLoadFailed } from "./clerkLoadFailure";
67
import { T3_CONNECT_ACCOUNT_PAGES } from "./T3ConnectAccountPages";
78
import { useT3ConnectAuthPrompt } from "./useT3ConnectAuthPrompt";
89

@@ -49,8 +50,21 @@ function ConfiguredT3ConnectSidebarAvatar() {
4950

5051
function ConfiguredT3ConnectSidebarSignIn() {
5152
const { isLoaded, isSignedIn } = useAuth();
53+
const loadFailed = useClerkLoadFailed();
5254
const { openAuthPrompt } = useT3ConnectAuthPrompt();
5355

56+
if (loadFailed) {
57+
return (
58+
<SidebarMenu>
59+
<SidebarMenuItem>
60+
<SidebarMenuButton onClick={retryClerkLoad}>
61+
<RotateCwIcon />
62+
<span>Retry T3 Connect</span>
63+
</SidebarMenuButton>
64+
</SidebarMenuItem>
65+
</SidebarMenu>
66+
);
67+
}
5468
if (!isLoaded || isSignedIn) return null;
5569

5670
return (
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { useClerk } from "@clerk/react";
2+
3+
export function useClerkLoadFailed() {
4+
return useClerk().status === "error";
5+
}
6+
7+
export function retryClerkLoad() {
8+
// Clerk caches its failed script load for the life of the page and never
9+
// retries, so a reload is the only recovery.
10+
window.location.reload();
11+
}

‎apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ import { useClerk } from "@clerk/react";
22

33
import { isElectron } from "../../env";
44
import { resolveClerkSignInProps } from "./authRedirect";
5+
import { retryClerkLoad } from "./clerkLoadFailure";
56

67
export function useT3ConnectAuthPrompt() {
78
const clerk = useClerk();
89
const openAuthPrompt = () => {
10+
if (clerk.status === "error") {
11+
retryClerkLoad();
12+
return;
13+
}
914
clerk.openSignIn(resolveClerkSignInProps(window.location.href, isElectron));
1015
};
1116
return { openAuthPrompt };

‎apps/web/src/components/cloud/ConnectCliAuthSurface.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
import { isElectron } from "../../env";
1010
import { StandalonePage, StandalonePageHeader } from "../ui/standalone-page";
1111
import { resolveClerkSignInProps } from "../clerk/authRedirect";
12+
import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
1213
import { Button } from "../ui/button";
1314

1415
const invalidLinkMessage = {
@@ -22,6 +23,7 @@ export function ConnectCliAuthorizeSurface() {
2223
const [request] = useState(() => readConnectAuthorizeRequest(new URL(window.location.href)));
2324
const clerk = useClerk();
2425
const { isLoaded, isSignedIn } = useAuth();
26+
const loadFailed = useClerkLoadFailed();
2527
const signInOpened = useRef(false);
2628
const redirecting = useRef(false);
2729

@@ -77,7 +79,13 @@ export function ConnectCliAuthorizeSurface() {
7779
: "Sign in to continue authorizing T3 Connect for your CLI."
7880
}
7981
/>
80-
{isLoaded && !isSignedIn ? (
82+
{loadFailed ? (
83+
<div className="mt-6">
84+
<Button type="button" onClick={retryClerkLoad}>
85+
Retry sign-in
86+
</Button>
87+
</div>
88+
) : isLoaded && !isSignedIn ? (
8189
<div className="mt-6">
8290
<Button type="button" onClick={openSignIn}>
8391
Sign in

‎apps/web/src/components/onboarding/WelcomePage.import.browser.test.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ vi.mock(import("@clerk/react"), async (original) => ({
6767
...(await original()),
6868
useAuth: (() => state.auth) as never,
6969
}));
70+
vi.mock(import("../clerk/clerkLoadFailure"), async (original) => ({
71+
...(await original()),
72+
useClerkLoadFailed: () => false,
73+
}));
7074
vi.mock(import("../clerk/useT3ConnectAuthPrompt"), async (original) => ({
7175
...(await original()),
7276
useT3ConnectAuthPrompt: (() => ({ openAuthPrompt: () => {} })) as never,

‎apps/web/src/components/onboarding/WelcomePage.tsx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import { useCloudLinkState } from "../../cloud/cloudLinkState";
4848
import { hasCloudPublicConfig } from "../../cloud/publicConfig";
4949
import { PRIVACY_POLICY_URL } from "../../legalLinks";
5050
import { workspaceAreaProps } from "../../lib/workspaceFocus";
51+
import { retryClerkLoad, useClerkLoadFailed } from "../clerk/clerkLoadFailure";
5152
import { useT3ConnectAuthPrompt } from "../clerk/useT3ConnectAuthPrompt";
5253
import { completeOnboarding } from "../../onboarding/firstRun";
5354
import {
@@ -961,6 +962,7 @@ function PhoneStep({ step, children }: { readonly step: number; readonly childre
961962

962963
function PhoneConnectLink({ environmentId }: { readonly environmentId: EnvironmentId }) {
963964
const { isLoaded, isSignedIn, userId } = useAuth({ treatPendingAsSignedOut: false });
965+
const loadFailed = useClerkLoadFailed();
964966
const { openAuthPrompt } = useT3ConnectAuthPrompt();
965967
const linkState = useCloudLinkState(environmentId);
966968
const refreshLinkState = useEffectEvent(linkState.refresh);
@@ -1029,9 +1031,15 @@ function PhoneConnectLink({ environmentId }: { readonly environmentId: Environme
10291031
<p className="text-sm text-foreground">
10301032
Sign in to T3 Connect here, then in the app with the same account.
10311033
</p>
1032-
<Button variant="outline" size="xs" disabled={!isLoaded} onClick={openAuthPrompt}>
1033-
Sign in to T3 Connect
1034-
</Button>
1034+
{loadFailed ? (
1035+
<Button variant="outline" size="xs" onClick={retryClerkLoad}>
1036+
Retry sign-in
1037+
</Button>
1038+
) : (
1039+
<Button variant="outline" size="xs" disabled={!isLoaded} onClick={openAuthPrompt}>
1040+
Sign in to T3 Connect
1041+
</Button>
1042+
)}
10351043
</>
10361044
);
10371045
}

0 commit comments

Comments
 (0)