@oxy.so/services 11.2.0-oxy-one.3 → 11.2.0-oxy-one.5

package/src/ui/context/__tests__/commitSessionFlow.test.ts

@@ -10,7 +10,7 @@ import {
 // (`setTimeout`) runs — so one tick flushes a detached reconcile task.
 const flush = (): Promise<void> => new Promise((resolve) => setTimeout(resolve, 0));
 
-const makeUser = (id: string): User => ({ id, username: id } as unknown as User);
+const makeUser = (id: string): User => ({ id, username: id }) as unknown as User;
 
 interface Deferred<T> {
   promise: Promise<T>;
@@ -18,7 +18,7 @@ interface Deferred<T> {
   reject: (reason?: unknown) => void;
 }
 
-const deferred = <T,>(): Deferred<T> => {
+const deferred = <T>(): Deferred<T> => {
   let resolve: (value: T) => void = () => undefined;
   let reject: (reason?: unknown) => void = () => undefined;
   const promise = new Promise<T>((res, rej) => {
@@ -248,7 +248,12 @@ describe('isolated OAuth session commit', () => {
     const order: string[] = [];
     const deps = buildDeps(order, { activate: true, isolatedOAuth: true });
     await commitDeviceSetAndResolve(deps);
-    expect(order).toEqual(['getCurrentUser', 'loginSuccess', 'onAuthStateChange', 'markAuthResolved']);
+    expect(order).toEqual([
+      'getCurrentUser',
+      'loginSuccess',
+      'onAuthStateChange',
+      'markAuthResolved',
+    ]);
     expect(deps.registerAndActivate).not.toHaveBeenCalled();
     expect(deps.addCurrentAccount).not.toHaveBeenCalled();
     expect(deps.startSocket).not.toHaveBeenCalled();

package/src/ui/context/__tests__/isolatedOAuthSession.test.ts

@@ -2,7 +2,11 @@ import { logoutIsolatedOAuthSession } from '../isolatedOAuthSession';
 
 const session = { sessionId: 'isolated-session', clientId: 'oxy_dk_external' };
 function deps() {
-  return { session, revokeSelf: jest.fn().mockResolvedValue(undefined), clearSessionState: jest.fn().mockResolvedValue(undefined) };
+  return {
+    session,
+    revokeSelf: jest.fn().mockResolvedValue(undefined),
+    clearSessionState: jest.fn().mockResolvedValue(undefined),
+  };
 }
 
 it('revokes exactly itself before clearing runtime/cache/token state', async () => {
@@ -10,12 +14,16 @@ it('revokes exactly itself before clearing runtime/cache/token state', async ()
   await expect(logoutIsolatedOAuthSession(input)).resolves.toEqual({ status: 'signed-out' });
   expect(input.revokeSelf).toHaveBeenCalledWith(session.sessionId);
   expect(input.clearSessionState).toHaveBeenCalledTimes(1);
-  expect(input.revokeSelf.mock.invocationCallOrder[0]).toBeLessThan(input.clearSessionState.mock.invocationCallOrder[0]);
+  expect(input.revokeSelf.mock.invocationCallOrder[0]).toBeLessThan(
+    input.clearSessionState.mock.invocationCallOrder[0],
+  );
 });
 
 it('rejects another target before contacting any revocation endpoint', async () => {
   const input = deps();
-  expect((await logoutIsolatedOAuthSession({ ...input, targetSessionId: 'other-app-session' })).status).toBe('failed');
+  expect(
+    (await logoutIsolatedOAuthSession({ ...input, targetSessionId: 'other-app-session' })).status,
+  ).toBe('failed');
   expect(input.revokeSelf).not.toHaveBeenCalled();
   expect(input.clearSessionState).not.toHaveBeenCalled();
 });

package/src/ui/context/commitSessionFlow.ts

@@ -85,10 +85,18 @@ export async function commitDeviceSetAndResolve(
     // valid session is minted. Log at debug; warn only on genuine unexpected
     // failures (network, 5xx, malformed).
     if (isUnauthorizedStatus(registrationError)) {
-      loggerUtil.debug('commitSession: device-set registration skipped (signed out)', LOG_CONTEXT, registrationError);
+      loggerUtil.debug(
+        'commitSession: device-set registration skipped (signed out)',
+        LOG_CONTEXT,
+        registrationError,
+      );
       return;
     }
-    loggerUtil.warn('commitSession: device-set registration failed', LOG_CONTEXT, registrationError);
+    loggerUtil.warn(
+      'commitSession: device-set registration failed',
+      LOG_CONTEXT,
+      registrationError,
+    );
   };
 
   // Hydrate the full user then flip the auth-resolution gate. Falls back to the
@@ -100,7 +108,11 @@ export async function commitDeviceSetAndResolve(
       fullUser = await getCurrentUser();
     } catch (profileError) {
       if (__DEV__) {
-        loggerUtil.debug('Failed to fetch full user on commit; using minimal fallback', LOG_CONTEXT, profileError);
+        loggerUtil.debug(
+          'Failed to fetch full user on commit; using minimal fallback',
+          LOG_CONTEXT,
+          profileError,
+        );
       }
       fullUser = fallbackUser;
     }

package/src/ui/context/hooks/useAuthOperations.ts

@@ -203,11 +203,15 @@ export const useAuthOperations = ({
       // Fetch device sessions
       let allDeviceSessions: ClientSession[] = [];
       try {
-        allDeviceSessions = await fetchSessionsWithFallback(oxyServices, sessionResponse.sessionId, {
-          fallbackDeviceId: sessionResponse.deviceId,
-          fallbackUserId: fullUser.id,
-          logger,
-        });
+        allDeviceSessions = await fetchSessionsWithFallback(
+          oxyServices,
+          sessionResponse.sessionId,
+          {
+            fallbackDeviceId: sessionResponse.deviceId,
+            fallbackUserId: fullUser.id,
+            logger,
+          },
+        );
       } catch (error) {
         if (__DEV__ && logger) {
           logger('Failed to fetch device sessions after login', error);
@@ -237,7 +241,12 @@ export const useAuthOperations = ({
           { merge: false },
         );
         onAuthStateChange?.(fullUser);
-        if (deviceRegistrationCommitted && !identityBinding && await store.setAutomaticIdentitySignInSuppressed?.(false) === false) logger?.('Failed to release explicit sign-out intent after sign-in');
+        if (
+          deviceRegistrationCommitted &&
+          !identityBinding &&
+          (await store.setAutomaticIdentitySignInSuppressed?.(false)) === false
+        )
+          logger?.('Failed to release explicit sign-out intent after sign-in');
         return fullUser;
       }
 
@@ -250,7 +259,12 @@ export const useAuthOperations = ({
       });
       await saveActiveSessionId(sessionResponse.sessionId);
       onAuthStateChange?.(fullUser);
-      if (deviceRegistrationCommitted && !identityBinding && await store.setAutomaticIdentitySignInSuppressed?.(false) === false) logger?.('Failed to release explicit sign-out intent after sign-in');
+      if (
+        deviceRegistrationCommitted &&
+        !identityBinding &&
+        (await store.setAutomaticIdentitySignInSuppressed?.(false)) === false
+      )
+        logger?.('Failed to release explicit sign-out intent after sign-in');
       return fullUser;
     },
     [
@@ -316,8 +330,11 @@ export const useAuthOperations = ({
         });
         if (result.status === 'failed') {
           handleAuthError(result.error, {
-            defaultMessage: 'Logout failed', code: LOGOUT_ERROR_CODE, onError,
-            setAuthError: (message) => runtime.setError(message), logger,
+            defaultMessage: 'Logout failed',
+            code: LOGOUT_ERROR_CODE,
+            onError,
+            setAuthError: (message) => runtime.setError(message),
+            logger,
           });
         }
         return result;
@@ -350,7 +367,11 @@ export const useAuthOperations = ({
           // Genuine FULL sign-out (no sessions remain): clear the persisted
           // device credential so a reload's cold boot finds nothing to restore,
           // then tear down local state.
-          if (!identityBinding && await store.setAutomaticIdentitySignInSuppressed?.(true) === false) throw new Error('Failed to persist explicit sign-out intent');
+          if (
+            !identityBinding &&
+            (await store.setAutomaticIdentitySignInSuppressed?.(true)) === false
+          )
+            throw new Error('Failed to persist explicit sign-out intent');
           await clearPersistedAuthSafe(store, logger);
           await clearSessionState();
         }
@@ -364,10 +385,14 @@ export const useAuthOperations = ({
         // "signed in" against a bearer the 401 lane has already cleared.
         if (isInvalid && sessionToLogout === activeSessionId) {
           // The active session is invalid → full sign-out; clear persisted state.
-          const intentPersisted = identityBinding ? true : await store.setAutomaticIdentitySignInSuppressed?.(true);
+          const intentPersisted = identityBinding
+            ? true
+            : await store.setAutomaticIdentitySignInSuppressed?.(true);
           await clearPersistedAuthSafe(store, logger);
           await clearSessionState();
-          return intentPersisted === false ? { status: 'failed', error: new Error('Failed to persist explicit sign-out intent') } : { status: 'signed-out' };
+          return intentPersisted === false
+            ? { status: 'failed', error: new Error('Failed to persist explicit sign-out intent') }
+            : { status: 'signed-out' };
         }
 
         if (sessionClient.getState()?.accounts.length === 0) {
@@ -428,7 +453,8 @@ export const useAuthOperations = ({
       // logoutAll is ALWAYS a full sign-out: clear the persisted device
       // credential so the next cold boot finds no session to restore, then tear
       // down local state.
-      if (!identityBinding && await store.setAutomaticIdentitySignInSuppressed?.(true) === false) throw new Error('Failed to persist explicit sign-out intent');
+      if (!identityBinding && (await store.setAutomaticIdentitySignInSuppressed?.(true)) === false)
+        throw new Error('Failed to persist explicit sign-out intent');
       await clearPersistedAuthSafe(store, logger);
       await clearSessionState();
     } catch (error) {
@@ -442,10 +468,13 @@ export const useAuthOperations = ({
         // `onTokensChanged(null)` by now, so rejecting here would contradict
         // the SDK's own authoritative 401 lane and hand the caller a failure
         // for work that is complete. Finish the local teardown and resolve.
-        const intentPersisted = identityBinding ? true : await store.setAutomaticIdentitySignInSuppressed?.(true);
+        const intentPersisted = identityBinding
+          ? true
+          : await store.setAutomaticIdentitySignInSuppressed?.(true);
         await clearPersistedAuthSafe(store, logger);
         await clearSessionState();
-        if (intentPersisted === false) throw new Error('Failed to persist explicit sign-out intent');
+        if (intentPersisted === false)
+          throw new Error('Failed to persist explicit sign-out intent');
         return;
       }
 
@@ -467,7 +496,16 @@ export const useAuthOperations = ({
       // would erase the server's reason from every caller's toast.
       throw error instanceof Error ? error : new Error(message);
     }
-  }, [clearSessionState, store, logger, onError, oxyServices, runtime, sessionClient, identityBinding]);
+  }, [
+    clearSessionState,
+    store,
+    logger,
+    onError,
+    oxyServices,
+    runtime,
+    sessionClient,
+    identityBinding,
+  ]);
 
   return {
     signIn,

package/src/ui/context/isolatedOAuthSession.ts

@@ -36,7 +36,10 @@ export async function logoutIsolatedOAuthSession(input: {
   clearSessionState: () => Promise<void>;
 }): Promise<LogoutResult> {
   if (input.targetSessionId && input.targetSessionId !== input.session.sessionId) {
-    return { status: 'failed', error: new Error('An isolated OAuth session may sign out only itself') };
+    return {
+      status: 'failed',
+      error: new Error('An isolated OAuth session may sign out only itself'),
+    };
   }
   try {
     await input.revokeSelf(input.session.sessionId);

package/src/ui/context/oxyContextTypes.ts

@@ -1,16 +1,29 @@
-import type { StartNativeOAuthSignInOptions, NativeOAuthSignInResult } from '../oauth/nativeAuthTransport';
+import type {
+  StartNativeOAuthSignInOptions,
+  NativeOAuthSignInResult,
+} from '../oauth/nativeAuthTransport';
 import type { ReactNode } from 'react';
 import type { LoginSessionResult } from '@oxy.so/contracts';
-import type { OxyServices, User, SessionLoginResponse, AccountNode, CreateAccountInput, ClientSession, ApiError } from '@oxy.so/core';
-import type { AccountDialogController, AccountDialogView, SessionClient, SessionMode } from '@oxy.so/core/session';
+import type {
+  OxyServices,
+  User,
+  SessionLoginResponse,
+  AccountNode,
+  CreateAccountInput,
+  ClientSession,
+  ApiError,
+} from '@oxy.so/core';
+import type {
+  AccountDialogController,
+  AccountDialogView,
+  SessionClient,
+  SessionMode,
+} from '@oxy.so/core/session';
 import type { UseFollowHook } from '../hooks/useFollow.types';
 import type { useLanguageManagement } from '../hooks/useLanguageManagement';
 import type { RouteName } from '../navigation/routes';
 import type { StartWebOAuthSignInOptions } from '../oauth/browserAuthTransport';
-import type {
-  OAuthConsentResult,
-  RequestOAuthConsentOptions,
-} from '../oauth/explicitOAuthConsent';
+import type { OAuthConsentResult, RequestOAuthConsentOptions } from '../oauth/explicitOAuthConsent';
 import type { WebAuthMode, WebOAuthSignInResult } from '../oauth/types';
 import type { StorageInterface } from '../utils/storageHelpers';
 import type { AccountQueriesConfig } from '../hooks/accountQueryPersistence';
@@ -108,7 +121,9 @@ export interface OxyContextState {
    * resolve to `{ status: 'unsupported' }`.
    */
   /** Native SDK finalizer; call only from an explicit user gesture. */
-  startNativeOAuthSignIn: (options: StartNativeOAuthSignInOptions) => Promise<NativeOAuthSignInResult>;
+  startNativeOAuthSignIn: (
+    options: StartNativeOAuthSignInOptions,
+  ) => Promise<NativeOAuthSignInResult>;
 
   startWebOAuthSignIn: (options: StartWebOAuthSignInOptions) => Promise<WebOAuthSignInResult>;
 
@@ -146,7 +161,9 @@ export interface OxyContextState {
   /** Server-authoritative device session client. `null` before an `OxyProvider` is mounted. */
   sessionClient: SessionClient | null;
   useFollow?: UseFollowHook;
-  showBottomSheet?: (screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> }) => void;
+  showBottomSheet?: (
+    screenOrConfig: RouteName | { screen: RouteName; props?: Record<string, unknown> },
+  ) => void;
   openAvatarPicker: () => void;
 
   accountDialogController: AccountDialogController | null;

package/src/ui/context/useOxyAccountGraph.ts

@@ -41,7 +41,13 @@ export function useOxyAccountGraph({
   const [accounts, setAccounts] = useState<AccountNode[]>([]);
 
   const refreshAccounts = useCallback(async (): Promise<void> => {
-    if (identityBound || isolatedOAuth || !isAuthenticated || !tokenReady || !oxyServices.session.accessToken) {
+    if (
+      identityBound ||
+      isolatedOAuth ||
+      !isAuthenticated ||
+      !tokenReady ||
+      !oxyServices.session.accessToken
+    ) {
       setAccounts([]);
       return;
     }
@@ -58,18 +64,34 @@ export function useOxyAccountGraph({
         loggerUtil.debug('Failed to load accounts', { component: 'OxyContext' }, err as unknown);
       }
     }
-  }, [identityBound, isolatedOAuth, isAuthenticated, oxyServices, tokenReady, clearSessionStateRef]);
+  }, [
+    identityBound,
+    isolatedOAuth,
+    isAuthenticated,
+    oxyServices,
+    tokenReady,
+    clearSessionStateRef,
+  ]);
 
   useEffect(() => {
     if (!identityBound && !isolatedOAuth && isAuthenticated && initialized && tokenReady) {
       refreshAccounts();
       void accountDialogControllerRef.current?.refresh();
     }
-  }, [identityBound, isolatedOAuth, isAuthenticated, initialized, tokenReady, refreshAccounts, accountDialogControllerRef]);
+  }, [
+    identityBound,
+    isolatedOAuth,
+    isAuthenticated,
+    initialized,
+    tokenReady,
+    refreshAccounts,
+    accountDialogControllerRef,
+  ]);
 
   const switchToAccount = useCallback(
     async (accountId: string): Promise<void> => {
-      if (isolatedOAuth) throw new Error('An isolated OAuth session cannot switch shared device accounts');
+      if (isolatedOAuth)
+        throw new Error('An isolated OAuth session cannot switch shared device accounts');
       if (identityBound) {
         // Loud rejection, never a silent no-op: a resolved promise here would
         // read to the caller as a completed switch that simply left the user

package/src/ui/hooks/accountDialogSnapshot.ts

@@ -47,7 +47,9 @@ export const EMPTY_ACCOUNT_DIALOG_SNAPSHOT: AccountDialogSnapshot = {
  * controller). `getSnapshot` returns a stable reference between changes, so
  * it is `useSyncExternalStore`-safe.
  */
-export function useAccountDialogSnapshot(controller: AccountDialogController | null): AccountDialogSnapshot {
+export function useAccountDialogSnapshot(
+  controller: AccountDialogController | null,
+): AccountDialogSnapshot {
   const subscribe = useCallback(
     (listener: () => void) => (controller ? controller.subscribe(listener) : () => undefined),
     [controller],

package/src/ui/hooks/accountQueryPersistence.ts

@@ -21,7 +21,13 @@
  * checks that its account is still the active one in the same tick it hydrates.
  */
 
-import { hashKey, type Mutation, type Query, type QueryClient, type QueryKey } from '@tanstack/react-query';
+import {
+  hashKey,
+  type Mutation,
+  type Query,
+  type QueryClient,
+  type QueryKey,
+} from '@tanstack/react-query';
 import type { StorageInterface } from '../utils/storageHelpers';
 import {
   PERSISTED_QUERY_PREFIXES,
@@ -181,10 +187,15 @@ export function createAccountQueryPersistence(
         if (current !== generation) return;
       }
       restoredFor = id;
-      writer = subscribeSnapshots(queryClient, filters, ACCOUNT_QUERY_PERSIST_THROTTLE_MS, (serialized) => {
-        if (current !== generation) return;
-        enqueue((target) => target.setItem(key, serialized));
-      });
+      writer = subscribeSnapshots(
+        queryClient,
+        filters,
+        ACCOUNT_QUERY_PERSIST_THROTTLE_MS,
+        (serialized) => {
+          if (current !== generation) return;
+          enqueue((target) => target.setItem(key, serialized));
+        },
+      );
       notify();
     });
   };

package/src/ui/hooks/mutations/mutationFactory.ts

@@ -60,7 +60,7 @@ export interface ProfileMutationConfig<TData, TVariables> {
 export function createProfileMutation<TVariables>(
   config: ProfileMutationConfig<User, TVariables>,
   queryClient: QueryClient,
-  activeSessionId: string | null
+  activeSessionId: string | null,
 ): UseMutationOptions<User, Error, TVariables, { previousUser?: User }> {
   const {
     mutationFn,
@@ -87,7 +87,9 @@ export function createProfileMutation<TVariables>(
       }
 
       // Snapshot previous user data
-      const previousUser = queryClient.getQueryData<User>(queryKeys.accounts.current(activeSessionId));
+      const previousUser = queryClient.getQueryData<User>(
+        queryKeys.accounts.current(activeSessionId),
+      );
 
       // Apply optimistic update if provided
       if (previousUser && optimisticUpdate) {
@@ -114,9 +116,12 @@ export function createProfileMutation<TVariables>(
       }
 
       // Show error toast
-      const message = typeof errorMessage === 'function'
-        ? errorMessage(error)
-        : (error instanceof Error ? error.message : errorMessage);
+      const message =
+        typeof errorMessage === 'function'
+          ? errorMessage(error)
+          : error instanceof Error
+            ? error.message
+            : errorMessage;
       toast.error(message);
     },
 
@@ -181,7 +186,7 @@ export interface GenericMutationConfig<TData, TVariables, TContext> {
  */
 export function createGenericMutation<TData, TVariables>(
   config: GenericMutationConfig<TData, TVariables, { previous?: TData }>,
-  queryClient: QueryClient
+  queryClient: QueryClient,
 ): UseMutationOptions<TData, Error, TVariables, { previous?: TData }> {
   const {
     mutationFn,