Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(mobile): discard account responses started during sign-out
Aditya Garud79f01503403b
diff --git a/apps/mobile/src/auth/AuthContext.tsx b/apps/mobile/src/auth/AuthContext.tsxindex 7bf8a1eb7..e80613331 100644--- a/apps/mobile/src/auth/AuthContext.tsx+++ b/apps/mobile/src/auth/AuthContext.tsx@@ -234,6 +234,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {SecureStore.deleteItemAsync(sessionKey),SecureStore.deleteItemAsync(userIdKey),]);+ sessionRevision.current += 1;setApiKey(null);setUserId(null);setBootstrap(null);diff --git a/apps/mobile/src/auth/AuthProvider.test.tsx b/apps/mobile/src/auth/AuthProvider.test.tsxindex 0983b5f16..469e20d3c 100644--- a/apps/mobile/src/auth/AuthProvider.test.tsx+++ b/apps/mobile/src/auth/AuthProvider.test.tsx@@ -31,6 +31,8 @@ const apiMock = vi.hoisted(() => ({workosAuthAvailable: true,}),),+ revokeSession: vi.fn(() => Promise.resolve({ success: true })),+ setActiveOrganization: vi.fn(),createSessionRequestUrl: vi.fn(() => "https://cap.so/api/mobile/session/request",),@@ -70,8 +72,8 @@ vi.mock("@/api/mobile", () => ({createMobileApiClient: vi.fn(() => ({bootstrap: apiMock.bootstrap,getAuthConfig: apiMock.getAuthConfig,- revokeSession: vi.fn(() => Promise.resolve({ success: true })),- setActiveOrganization: vi.fn(),+ revokeSession: apiMock.revokeSession,+ setActiveOrganization: apiMock.setActiveOrganization,})),createSessionRequestUrl: apiMock.createSessionRequestUrl,}));@@ -89,10 +91,12 @@ const flushMicrotasks = async () => {const createDeferred = <T,>() => {let resolve!: (value: T) => void;- const promise = new Promise<T>((nextResolve) => {+ let reject!: (reason: Error) => void;+ const promise = new Promise<T>((nextResolve, nextReject) => {resolve = nextResolve;+ reject = nextReject;});- return { promise, resolve };+ return { promise, reject, resolve };};const states: Array<{@@ -136,6 +140,9 @@ describe("AuthProvider", () => {googleAuthAvailable: true,workosAuthAvailable: true,});+ apiMock.revokeSession.mockReset();+ apiMock.revokeSession.mockResolvedValue({ success: true });+ apiMock.setActiveOrganization.mockReset();apiMock.createSessionRequestUrl.mockClear();webBrowserMock.openAuthSessionAsync.mockReset();});@@ -302,4 +309,132 @@ describe("AuthProvider", () => {expect(latestAuth?.status).toBe("signedOut");expect(latestAuth?.bootstrap).toBeNull();});++ it("discards a refresh started while sign-out is revoking the session", async () => {+ secureStoreMock.getItemAsync.mockImplementation((key: string) =>+ Promise.resolve(key === "cap.mobile.apiKey" ? "key_123" : "user_123"),+ );+ const revocation = createDeferred<{ success: boolean }>();+ const staleBootstrap = createDeferred<{+ activeOrganizationId: string;+ user: { email: string; name: string };+ }>();+ apiMock.revokeSession.mockReturnValueOnce(revocation.promise);+ 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 signOutPromise: Promise<void> | undefined;+ let refreshPromise: Promise<void> | undefined;+ await act(async () => {+ signOutPromise = latestAuth?.signOut();+ refreshPromise = latestAuth?.refresh();+ });+ expect(apiMock.bootstrap).toHaveBeenCalledTimes(2);+ await act(async () => {+ revocation.resolve({ success: true });+ await signOutPromise;+ });+ expect(latestAuth?.status).toBe("signedOut");++ await act(async () => {+ staleBootstrap.resolve({+ activeOrganizationId: "org_123",+ user: { email: "[email protected]", name: "Old" },+ });+ await refreshPromise;+ });+ expect(latestAuth?.bootstrap).toBeNull();+ });++ it("keeps a new session when an old automatic bootstrap fails", async () => {+ secureStoreMock.getItemAsync.mockImplementation((key: string) =>+ Promise.resolve(key === "cap.mobile.apiKey" ? "old_key" : "old_user"),+ );+ const oldBootstrap = createDeferred<{+ activeOrganizationId: string;+ user: { email: string; name: string };+ }>();+ apiMock.bootstrap.mockReturnValueOnce(oldBootstrap.promise);+ apiMock.bootstrap.mockResolvedValueOnce({+ activeOrganizationId: "new_org",+ user: { email: "[email protected]", name: "New" },+ });+ webBrowserMock.openAuthSessionAsync.mockResolvedValueOnce({+ type: "success",+ url: "cap://auth?api_key=new_key&user_id=new_user",+ });++ await act(async () => {+ TestRenderer.create(+ React.createElement(AuthProvider, null, React.createElement(Probe)),+ );+ await flushMicrotasks();+ });+ await act(async () => {+ await latestAuth?.signInWithApple();+ await flushMicrotasks();+ });+ expect(latestAuth?.bootstrap?.user.email).toBe("[email protected]");++ await act(async () => {+ oldBootstrap.reject(new Error("Old session expired"));+ await flushMicrotasks();+ });+ expect(latestAuth?.status).toBe("signedIn");+ expect(latestAuth?.apiKey).toBe("new_key");+ expect(latestAuth?.bootstrap?.user.email).toBe("[email protected]");+ expect(secureStoreMock.deleteItemAsync).not.toHaveBeenCalled();+ });++ it("discards an organization switch from an old session", async () => {+ secureStoreMock.getItemAsync.mockImplementation((key: string) =>+ Promise.resolve(key === "cap.mobile.apiKey" ? "old_key" : "old_user"),+ );+ const oldSwitch = createDeferred<{+ activeOrganizationId: string;+ user: { email: string; name: string };+ }>();+ apiMock.setActiveOrganization.mockReturnValueOnce(oldSwitch.promise);+ webBrowserMock.openAuthSessionAsync.mockResolvedValueOnce({+ type: "success",+ url: "cap://auth?api_key=new_key&user_id=new_user",+ });++ await act(async () => {+ TestRenderer.create(+ React.createElement(AuthProvider, null, React.createElement(Probe)),+ );+ await flushMicrotasks();+ });+ let switchPromise: Promise<void> | undefined;+ await act(async () => {+ switchPromise = latestAuth?.setActiveOrganization("old_org");+ await Promise.resolve();+ });+ await act(async () => {+ await latestAuth?.signInWithApple();+ await flushMicrotasks();+ });+ expect(latestAuth?.bootstrap?.user.email).toBe("[email protected]");++ await act(async () => {+ oldSwitch.resolve({+ activeOrganizationId: "old_org",+ user: { email: "[email protected]", name: "Old" },+ });+ await switchPromise;+ });+ expect(latestAuth?.bootstrap?.user.email).toBe("[email protected]");+ });});