Skip to content

Commit fa19061

Browse files
committed
Fix registration status stuck pending and destructive teardown on unmount
- Reset a registration status left as 'pending' back to 'unknown' when the device registration effect exits without reaching the relay (signed out, missing relay config, or superseded by a newer generation). - Add a non-destructive suspend path for relay token provider teardown so CloudAuthBridge unmount and missing cloud config no longer end local Live Activities or clear the persisted registration record while the user is still signed in.
1 parent 5225bdb commit fa19061

2 files changed

Lines changed: 41 additions & 12 deletions

File tree

apps/mobile/src/features/agent-awareness/remoteRegistration.ts

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@ export function shouldRegisterAgentAwarenessDeviceForProvider(
143143
return identity === undefined || identity !== previousIdentity;
144144
}
145145

146+
function removeRelaySubscriptions(): void {
147+
pushToStartSubscription?.remove();
148+
pushToStartSubscription = null;
149+
pushTokenSubscription?.remove();
150+
pushTokenSubscription = null;
151+
appStateSubscription?.remove();
152+
appStateSubscription = null;
153+
if (activeLiveActivityRegistrationRetry) {
154+
clearTimeout(activeLiveActivityRegistrationRetry);
155+
activeLiveActivityRegistrationRetry = null;
156+
}
157+
}
158+
159+
// Drops the relay token provider without sign-out semantics: the Clerk session
160+
// can still be valid while the auth bridge tears down (remounts, provider tree
161+
// changes, missing cloud config). Listeners stop, but local Live Activities,
162+
// the persisted registration record, and the provider identity stay intact so
163+
// re-activating the same account does not end activities or force
164+
// re-registration.
165+
export function suspendAgentAwarenessRelayTokenProvider(): void {
166+
relayTokenProvider = null;
167+
removeRelaySubscriptions();
168+
}
169+
146170
export function setAgentAwarenessRelayTokenProvider(
147171
provider: (() => Promise<string | null>) | null,
148172
identity?: string,
@@ -158,16 +182,7 @@ export function setAgentAwarenessRelayTokenProvider(
158182
relayTokenProvider = provider;
159183
relayTokenProviderIdentity = provider ? (identity ?? null) : null;
160184
if (!provider) {
161-
pushToStartSubscription?.remove();
162-
pushToStartSubscription = null;
163-
pushTokenSubscription?.remove();
164-
pushTokenSubscription = null;
165-
appStateSubscription?.remove();
166-
appStateSubscription = null;
167-
if (activeLiveActivityRegistrationRetry) {
168-
clearTimeout(activeLiveActivityRegistrationRetry);
169-
activeLiveActivityRegistrationRetry = null;
170-
}
185+
removeRelaySubscriptions();
171186
// Without a signed-in user the relay can no longer update or end these
172187
// activities, so they would sit orphaned on the lock screen.
173188
endLocalLiveActivities("live activity cleanup after cloud sign-out failed");
@@ -472,6 +487,11 @@ function startPendingDeviceRegistration(): void {
472487
if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
473488
setRegistrationStatus("failed");
474489
logRegistrationError(next.context, squashAtomCommandFailure(result));
490+
} else if (registrationStatus === "pending") {
491+
// The registration exited without reaching the relay (signed out,
492+
// missing relay config, or superseded by a newer generation); don't
493+
// leave the status stuck on pending.
494+
setRegistrationStatus("unknown");
475495
}
476496
logRegistrationDebug("device registration finished", { generation });
477497
if (activeDeviceRegistration === registration) {

apps/mobile/src/features/cloud/CloudAuthProvider.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { appAtomRegistry } from "../../state/atom-registry";
1515
import { useAtomCommand } from "../../state/use-atom-command";
1616
import {
1717
setAgentAwarenessRelayTokenProvider,
18+
suspendAgentAwarenessRelayTokenProvider,
1819
unregisterAgentAwarenessDeviceForCurrentUser,
1920
} from "../agent-awareness/remoteRegistration";
2021
import { resolveCloudPublicConfig, resolveRelayClerkTokenOptions } from "./publicConfig";
@@ -32,6 +33,14 @@ export function deactivateCloudRelayAccount(): void {
3233
setManagedRelaySession(appAtomRegistry, null);
3334
}
3435

36+
// Teardown without sign-out semantics: the Clerk session may still be valid
37+
// (bridge remounts, provider tree changes, missing cloud config), so local
38+
// Live Activities and the persisted registration record must survive.
39+
export function suspendCloudRelayAccount(): void {
40+
suspendAgentAwarenessRelayTokenProvider();
41+
setManagedRelaySession(appAtomRegistry, null);
42+
}
43+
3544
export function activateCloudRelayAccount(
3645
accountId: string,
3746
tokenProvider: () => Promise<string | null>,
@@ -143,7 +152,7 @@ function CloudAuthBridge(props: { readonly children: ReactNode }) {
143152
useEffect(
144153
() => () => {
145154
previousTokenProviderRef.current = null;
146-
deactivateCloudRelayAccount();
155+
suspendCloudRelayAccount();
147156
},
148157
[],
149158
);
@@ -158,7 +167,7 @@ export function CloudAuthProvider(props: { readonly children: ReactNode }) {
158167

159168
useEffect(() => {
160169
if (!publishableKey || !relayUrl) {
161-
deactivateCloudRelayAccount();
170+
suspendCloudRelayAccount();
162171
}
163172
}, [publishableKey, relayUrl]);
164173

0 commit comments

Comments
 (0)