Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(mobile): ignore stale account responses after sign-out
Aditya Garudd22899af02a9
diff --git a/apps/mobile/src/auth/AuthContext.tsx b/apps/mobile/src/auth/AuthContext.tsxindex 7c4902a5b..7bf8a1eb7 100644--- a/apps/mobile/src/auth/AuthContext.tsx+++ b/apps/mobile/src/auth/AuthContext.tsx@@ -9,6 +9,7 @@ import {useContext,useEffect,useMemo,+ useRef,useState,} from "react";import {@@ -70,6 +71,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {null,);const [loading, setLoading] = useState(true);+ const sessionRevision = useRef(0);const client = useMemo(() =>@@ -89,8 +91,9 @@ export function AuthProvider({ children }: { children: ReactNode }) {);const refresh = useCallback(async () => {+ const revision = sessionRevision.current;const response = await client.bootstrap();- setBootstrap(response);+ if (revision === sessionRevision.current) setBootstrap(response);}, [client]);useEffect(() => {@@ -126,7 +129,10 @@ export function AuthProvider({ children }: { children: ReactNode }) {return;}+ const revision = sessionRevision.current;refresh().catch(() => {+ if (revision !== sessionRevision.current) return;+ sessionRevision.current += 1;setApiKey(null);setUserId(null);setBootstrap(null);@@ -137,6 +143,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {const storeSession = useCallback(async (session: { apiKey: string; userId: string | null }) => {+ sessionRevision.current += 1;await SecureStore.setItemAsync(sessionKey,session.apiKey,@@ -219,6 +226,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {);const signOut = useCallback(async () => {+ sessionRevision.current += 1;if (apiKey) {await client.revokeSession().catch(() => {});}@@ -233,8 +241,9 @@ export function AuthProvider({ children }: { children: ReactNode }) {const setActiveOrganization = useCallback(async (organizationId: string) => {+ const revision = sessionRevision.current;const nextBootstrap = await client.setActiveOrganization(organizationId);- setBootstrap(nextBootstrap);+ if (revision === sessionRevision.current) setBootstrap(nextBootstrap);},[client],);diff --git a/apps/mobile/src/auth/AuthProvider.test.tsx b/apps/mobile/src/auth/AuthProvider.test.tsxindex 05f98ea89..0983b5f16 100644--- a/apps/mobile/src/auth/AuthProvider.test.tsx+++ b/apps/mobile/src/auth/AuthProvider.test.tsx@@ -87,6 +87,14 @@ const flushMicrotasks = async () => {await Promise.resolve();};+const createDeferred = <T,>() => {+ let resolve!: (value: T) => void;+ const promise = new Promise<T>((nextResolve) => {+ resolve = nextResolve;+ });+ return { promise, resolve };+};+const states: Array<{apiKey: string | null;status: string;@@ -251,4 +259,47 @@ describe("AuthProvider", () => {"cap.mobile.userId",);});++ it("does not restore account data when a refresh finishes after sign-out", async () => {+ secureStoreMock.getItemAsync.mockImplementation((key: string) =>+ Promise.resolve(key === "cap.mobile.apiKey" ? "key_123" : "user_123"),+ );+ const staleBootstrap = createDeferred<{+ activeOrganizationId: string;+ user: { email: string; name: string };+ }>();+ apiMock.bootstrap.mockResolvedValueOnce({+ activeOrganizationId: "org_123",+ user: { email: "[email protected]", name: "Old" },+ });+ apiMock.bootstrap.mockReturnValueOnce(staleBootstrap.promise);++ await act(async () => {+ TestRenderer.create(+ React.createElement(AuthProvider, null, React.createElement(Probe)),+ );+ await flushMicrotasks();+ });+ expect(latestAuth?.bootstrap?.user.email).toBe("[email protected]");++ let refreshPromise: Promise<void> | undefined;+ await act(async () => {+ refreshPromise = latestAuth?.refresh();+ await Promise.resolve();+ });+ await act(async () => {+ await latestAuth?.signOut();+ });+ expect(latestAuth?.bootstrap).toBeNull();++ await act(async () => {+ staleBootstrap.resolve({+ activeOrganizationId: "org_123",+ user: { email: "[email protected]", name: "Old" },+ });+ await refreshPromise;+ });+ expect(latestAuth?.status).toBe("signedOut");+ expect(latestAuth?.bootstrap).toBeNull();+ });});