Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): complete OAuth cancellation lifecycle guards
chenhong1ddd15fb23da
diff --git a/apps/mobile/src/auth/AuthContext.tsx b/apps/mobile/src/auth/AuthContext.tsxindex a97ea1d6e9..8244a87565 100644--- a/apps/mobile/src/auth/AuthContext.tsx+++ b/apps/mobile/src/auth/AuthContext.tsx@@ -1826,7 +1826,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {throw error;});if (!isCurrent()) return false;- if (pending) {+ if (pending && !oauthCancelledRef.current) {// Retained credentials belong to the browser attempt. Restore its// cancelable wait screen instead of offering an unrelated login.updateLoginState({ step: 'browser-redirect', label: pending.label });@@ -1952,8 +1952,11 @@ export function AuthProvider({ children }: { children: ReactNode }) {if (Platform.OS === 'android' && result.type === 'dismiss') {return true;}+ oauthCancelledRef.current = true;+ setIsBusy(false);+ const cancelledEpoch = ++loginFlowEpochRef.current;await deleteSecureItem(PENDING_OAUTH_KEY).catch(() => undefined);- assertLoginFlowCurrent(expectedLoginFlowEpoch);+ assertLoginFlowCurrent(cancelledEpoch);pendingAuthRealmRef.current = null;updateLoginState(null);throw authCodeError('USER_CANCELLED');@@ -2355,7 +2358,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {} catch (error) {if (loginFlowEpochRef.current !== expectedLoginFlowEpoch) return false;const code = authErrorCode(error);- if (action.type === 'reset') updateLoginState({ step: 'error', code });+ if (action.type === 'reset') updateLoginState({ step: 'error', code, recoverTo: 'identifier' });if (code === 'INVALID_LOGIN_TICKET' ||code === 'INVALID_BIND_TICKET' ||@@ -2717,6 +2720,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {const cancelAddAccount = useCallback(async (): Promise<void> => {oauthCancelledRef.current = true;loginFlowEpochRef.current += 1;+ const cancelledEpoch = loginFlowEpochRef.current;setIsBusy(false);pendingAccountTokenRef.current = null;pendingAccountRefreshTokenRef.current = null;@@ -2731,6 +2735,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {additionalLoginRef.current = false;sessionRecoverySuspendedRef.current = false;await deleteSecureItem(PENDING_OAUTH_KEY).catch(() => undefined);+ if (loginFlowEpochRef.current !== cancelledEpoch) return;activateMobileSessionRealm(activeAuthRealmRef.current);setMobileAuthOwner(userRef.current?.id ?? null, activeAuthRealmRef.current);updateLoginState(null);@@ -2740,6 +2745,9 @@ export function AuthProvider({ children }: { children: ReactNode }) {const clearLocalSession = useCallback(async (options: { persistedAuthAlreadyCleared?: boolean } = {},) => {+ oauthCancelledRef.current = true;+ loginFlowEpochRef.current += 1;+ setIsBusy(false);// 任何登录态清除路径(logout / terminateSession / 账号注销 / ACCOUNT_UNAVAILABLE)// 都先 best-effort 注销移动推送 token —— 只挂在 logout 会漏掉终止路径,设备会// 继续收到旧账号的任务通知。token 此刻可能已失效(账号不可用),失败静默,@@ -2757,7 +2765,6 @@ export function AuthProvider({ children }: { children: ReactNode }) {// 同步失效认证代次,必须早于第一个 await。否则推送 token 注销的网络等待窗口内,// 迟到的 canary / XD beta 探测仍会把旧账号结果写回本地。authGenerationRef.current += 1;- loginFlowEpochRef.current += 1;refreshInFlightRef.current = null;await unregisterPushTokenBestEffort(accessTokenRef.current,@@ -2858,6 +2865,9 @@ export function AuthProvider({ children }: { children: ReactNode }) {const logout = useCallback(async () => {// Invalidate refresh/login continuations before the first storage await;// the UI remains signed in until the durable credential transaction wins.+ oauthCancelledRef.current = true;+ loginFlowEpochRef.current += 1;+ setIsBusy(false);authGenerationRef.current += 1;refreshInFlightRef.current = null;const token = accessTokenRef.current;@@ -3468,6 +3478,7 @@ async function readPendingOAuth(): Promise<PendingOAuth> {throw authCodeError('INVALID_AUTH_CODE');}if (+ !parsed ||typeof parsed.codeVerifier !== 'string' ||typeof parsed.deviceId !== 'string' ||typeof parsed.state !== 'string' ||diff --git a/apps/mobile/src/auth/__tests__/browserAuthSession.test.tsx b/apps/mobile/src/auth/__tests__/browserAuthSession.test.tsxindex fb84574276..6bf26e9e0e 100644--- a/apps/mobile/src/auth/__tests__/browserAuthSession.test.tsx+++ b/apps/mobile/src/auth/__tests__/browserAuthSession.test.tsx@@ -8,6 +8,8 @@ const native = vi.hoisted(() => ({storage: new Map<string, string>(),readSecure: vi.fn(),deleteSecure: vi.fn(),+ logoutCleanup: vi.fn(),+ unregisterPush: vi.fn(),links: new Set<(event: { url: string }) => void>(),open: vi.fn(),exchange: vi.fn(),@@ -76,6 +78,7 @@ vi.mock('@/auth/pkce', () => ({vi.mock('@/auth/deviceId', () => ({ ensureDeviceId: async () => 'fixture-device', hasStoredDeviceId: async () => true }));vi.mock('@/auth/mobileAccountVault', () => ({readMobileAccountVault: async () => null,+ clearMobileLoginCredentialsForLogout: native.logoutCleanup,listMobileSavedAccounts: () => [],reconcileMobileActiveAuthSession: async () => null,}));@@ -86,12 +89,12 @@ vi.mock('@/auth/canaryChannelSync', () => ({}));vi.mock('@/auth/xdOrgBetaDefault', () => ({}));vi.mock('@/analytics/mobileTapdb', () => ({ clearTapdbUser: async () => {} }));vi.mock('@/analytics/analyticsConsentStore', () => ({}));-vi.mock('@/notifications/pushNotifications', () => ({}));+vi.mock('@/notifications/pushNotifications', () => ({ unregisterPushTokenBestEffort: native.unregisterPush }));vi.mock('@/session/agentCapabilitiesCache', () => ({}));vi.mock('@/session/composerPaletteCache', () => ({}));vi.mock('@/device-link/remoteResourceCache', () => ({}));vi.mock('@/session/mobileHomeListCache', () => ({}));-vi.mock('@/device-link/clipboardInvitationHistory', () => ({}));+vi.mock('@/device-link/clipboardInvitationHistory', () => ({ clearClipboardInvitationHistory: async () => {} }));vi.mock('@/remote-desktop/credentialIdentity', () => ({}));vi.mock('@/session/mobileSessionMessageCache', () => ({}));vi.mock('@/session/remoteHistoryDiskCache', () => ({}));@@ -172,6 +175,8 @@ describe('browser auth session lifecycle (real AuthProvider, mocked native/netwonative.initialUrl.mockReset().mockResolvedValue(null);native.requestCode.mockReset().mockResolvedValue(undefined);native.storage.clear();+ native.logoutCleanup.mockReset();+ native.unregisterPush.mockReset();native.deleteSecure.mockReset().mockImplementation(async (key: string) => { native.storage.delete(key); });native.readSecure.mockReset().mockImplementation(async (key: string) => native.storage.get(key) ?? null);native.state = 0;@@ -315,6 +320,89 @@ describe('browser auth session lifecycle (real AuthProvider, mocked native/netwoexpect(native.exchange).not.toHaveBeenCalled();});+ it.each([+ ['android', 'cancel', 'delayed'], ['android', 'cancel', 'failed'],+ ['ios', 'cancel', 'delayed'], ['ios', 'cancel', 'failed'],+ ['ios', 'dismiss', 'delayed'], ['ios', 'dismiss', 'failed'],+ ])('fences %s browser %s during %s credential deletion', async (platform, type, deletion) => {+ native.platform = platform;+ native.open.mockResolvedValueOnce({ type });+ let finishDelete!: () => void;+ if (deletion === 'failed') native.deleteSecure.mockRejectedValueOnce(new Error('fixture storage failure'));+ else native.deleteSecure.mockImplementationOnce(() => new Promise<void>(resolve => {+ finishDelete = () => { native.storage.delete(pendingKey); resolve(); };+ }));+ let result!: Promise<unknown>;+ await act(async () => {+ result = auth.dispatchLoginAction({ type: 'start-social-browser', provider: 'wechat', label: 'WeChat' })+ .catch(error => error);+ });+ await emitLink(callbackUrl());+ expect(native.exchange).not.toHaveBeenCalled();+ await act(async () => {+ if (deletion === 'delayed') finishDelete();+ expect(await result).toMatchObject({ code: 'USER_CANCELLED' });+ });+ expect(auth.loginState).toBeNull();+ });++ it('invalidates an exchange already running when the browser reports cancel', async () => {+ let finishBrowser!: (value: { type: string }) => void;+ let finishExchange!: (value: typeof verifiedOutcome) => void;+ native.open.mockImplementationOnce(() => new Promise(resolve => { finishBrowser = resolve; }));+ native.exchange.mockImplementationOnce(() => new Promise(resolve => { finishExchange = resolve; }));+ let result!: Promise<unknown>;+ await act(async () => {+ result = auth.dispatchLoginAction({ type: 'start-social-browser', provider: 'wechat', label: 'WeChat' })+ .catch(error => error);+ });+ await emitLink(callbackUrl());+ await act(async () => { finishBrowser({ type: 'cancel' }); await result; });+ expect(auth.loginState).toBeNull();+ await act(async () => { finishExchange(verifiedOutcome); });+ expect(auth.loginState).toBeNull();+ expect(auth.authError).toBeNull();+ expect(auth.isBusy).toBe(false);+ });++ it.each(['logout', 'terminateSession'] as const)('fences OAuth before %s awaits cleanup', async action => {+ await start();+ const url = callbackUrl();+ let failCleanup!: (error: Error) => void;+ const boundary = action === 'logout' ? native.logoutCleanup : native.unregisterPush;+ boundary.mockImplementationOnce(() => new Promise((_, reject) => { failCleanup = reject; }));+ let closing!: Promise<unknown>;+ await act(async () => { closing = auth[action]().catch(error => error); });+ expect(boundary).toHaveBeenCalledTimes(1);+ await emitLink(url);+ expect(native.exchange).not.toHaveBeenCalled();+ const cleanupError = new Error('fixture cleanup failure');+ await act(async () => { failCleanup(cleanupError); expect(await closing).toBe(cleanupError); });+ await emitLink(url);+ expect(native.exchange).not.toHaveBeenCalled();+ });++ it('does not let a delayed add-account close erase a newer login', async () => {+ await act(async () => { await auth.beginAddAccount(); });+ await start();+ let finishDelete!: () => void;+ native.deleteSecure.mockImplementationOnce(() => {+ native.storage.delete(pendingKey);+ return new Promise<void>(resolve => { finishDelete = resolve; });+ });+ let closing!: Promise<void>;+ await act(async () => { closing = auth.cancelAddAccount(); });+ await act(async () => { await auth.beginAddAccount(); });+ await start();+ const pending = native.storage.get(pendingKey);+ const state = auth.loginState;+ await act(async () => { finishDelete(); await closing; });+ expect(auth.loginState).toBe(state);+ expect(native.storage.get(pendingKey)).toBe(pending);+ await emitLink(callbackUrl());+ expect(auth.loginState?.step).toBe('sso-verification');+ });+it('does not erase PKCE when Linking begins exchanging before Android dismiss resolves', async () => {let resolveExchange!: (value: typeof verifiedOutcome) => void;native.exchange.mockImplementation(() => new Promise((resolve) => { resolveExchange = resolve; }));@@ -524,7 +612,7 @@ describe('browser auth session lifecycle (real AuthProvider, mocked native/netwoexpect(auth.loginState?.step).toBe('sso-verification');});- it.each(['email', 'sms'] as const)('cancels a restored OAuth attempt before starting %s login', async kind => {+ it.each(['email', 'phone'] as const)('cancels a restored OAuth attempt before starting %s login', async kind => {await start();const url = callbackUrl();await act(async () => root.unmount());@@ -548,9 +636,21 @@ describe('browser auth session lifecycle (real AuthProvider, mocked native/netwoexpect(auth.isAuthenticated).toBe(false);});- it.each(['expired', 'malformed', 'absent'])('starts the normal identifier flow for %s persisted OAuth', async kind => {+ it('does not restore a canceled browser wait on remount when deletion failed', async () => {+ await start();+ const url = callbackUrl();+ native.deleteSecure.mockRejectedValueOnce(new Error('fixture storage failure'));+ await act(async () => { await auth.cancelAddAccount(); });+ await mountLoginScreen('remount-after-cancel');+ expect(auth.loginState?.step).toBe('identifier');+ await emitLink(url);+ expect(native.exchange).not.toHaveBeenCalled();+ expect(auth.loginState?.step).toBe('identifier');+ });++ it.each(['expired', 'malformed', 'null', 'absent'])('starts the normal identifier flow for %s persisted OAuth', async kind => {await act(async () => { await auth.cancelAddAccount(); });- if (kind !== 'absent') native.storage.set(pendingKey, kind === 'malformed' ? '{invalid' : JSON.stringify({+ if (kind !== 'absent') native.storage.set(pendingKey, kind === 'malformed' ? '{invalid' : kind === 'null' ? 'null' : JSON.stringify({state: 'fixture-state', codeVerifier: 'fixture-verifier', deviceId: 'fixture-device',realm: 'cn', label: 'Fixture SSO', createdAt: Date.now() - 10 * 60_000 - 1,}));