@oxy.so/services 6.2.0 → 8.1.0

package/src/ui/hooks/useAvatarPicker.ts

@@ -12,7 +12,7 @@
  *      one entry into it.
  *   2. The surface resolves with the cropped JPEG, with `{ removed: true }` when
  *      the user removed their photo, or `undefined` when they cancelled.
- *   3. A crop is uploaded as a NEW file via `oxyServices.assetUpload` and set as
+ *   3. A crop is uploaded as a NEW file via `oxyServices.assets.upload` and set as
  *      the avatar; a removal clears the avatar field.
  *
  * `expo-image-manipulator` is required for the crop step and `expo-image-picker`
@@ -36,7 +36,7 @@ interface UseAvatarPickerOptions {
   queryClient: QueryClient;
 }
 
-/** Upload result shape returned by oxyServices.assetUpload (single-file path). */
+/** Upload result shape returned by oxyServices.assets.upload (single-file path). */
 interface AssetUploadResult {
   file?: { id?: string };
   files?: Array<{ id?: string }>;
@@ -65,13 +65,13 @@ export function useAvatarPicker({
   const finalizeCroppedAvatar = useCallback(
     async (cropped: AvatarCropResult) => {
       try {
-        const uploadResult = (await oxyServices.assetUpload(
+        const uploadResult = (await oxyServices.assets.upload(
           {
             uri: cropped.uri,
             type: cropped.mime,
             name: `avatar-${Date.now()}.jpg`,
           },
-          'public',
+          { visibility: 'public' },
         )) as AssetUploadResult;
 
         const newFileId = extractUploadedFileId(uploadResult);

package/src/ui/hooks/useDeviceManagement.ts

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import type { ApiError } from '@oxy.so/core';
-import { DeviceManager } from '@oxy.so/core';
+import { DeviceManager } from '@oxy.so/core/session';
 import type { OxyServices } from '@oxy.so/core';
 import { handleAuthError } from '../utils/errorHandlers';
 
@@ -49,7 +49,7 @@ export const useDeviceManagement = ({
   > => {
     if (!activeSessionId) throw new Error('No active session');
     try {
-      return await oxyServices.getDeviceSessions(activeSessionId);
+      return await oxyServices.devices.sessions(activeSessionId);
     } catch (error) {
       handleAuthError(error, {
         defaultMessage: 'Failed to get device sessions',
@@ -65,7 +65,7 @@ export const useDeviceManagement = ({
     if (!activeSessionId) throw new Error('No active session');
 
     try {
-      await oxyServices.logoutAllDeviceSessions(activeSessionId);
+      await oxyServices.devices.logoutAll(activeSessionId);
       await clearSessionState();
     } catch (error) {
       handleAuthError(error, {
@@ -83,7 +83,7 @@ export const useDeviceManagement = ({
       if (!activeSessionId) throw new Error('No active session');
 
       try {
-        await oxyServices.updateDeviceName(activeSessionId, deviceName);
+        await oxyServices.devices.rename(activeSessionId, deviceName);
         await DeviceManager.updateDeviceName(deviceName);
       } catch (error) {
         handleAuthError(error, {

package/src/ui/hooks/useDeviceSwitcher.ts

@@ -1,10 +1,5 @@
 import { useCallback, useMemo } from 'react';
-import {
-    buildSwitcherRows,
-    projectDevicePrincipals,
-    type DeviceContext,
-    type SwitcherPrincipalRow,
-} from '@oxy.so/core';
+import { buildSwitcherRows, projectDevicePrincipals, type DeviceContext, type SwitcherPrincipalRow } from '@oxy.so/core/session';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from './useI18n';
 import { useAccountDialogSnapshot } from './accountDialogSnapshot';
@@ -69,7 +64,7 @@ export function useDeviceSwitcher(): UseDeviceSwitcherResult {
             buildSwitcherRows(
                 projectDevicePrincipals(snapshot.directory),
                 snapshot.activeContext?.contextId ?? null,
-                (avatar) => (avatar ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined),
+                (avatar) => (avatar ? oxyServices.assets.publicUrl(avatar, 'thumb') : undefined),
                 locale,
             ),
         [snapshot.directory, snapshot.activeContext, oxyServices, locale],

package/src/ui/hooks/useFileDownloadUrl.ts

@@ -55,11 +55,7 @@ export const useFileDownloadUrl = (
       setError(null);
 
       try {
-        if (typeof instance.getFileDownloadUrlAsync !== 'function') {
-          throw new Error('getFileDownloadUrlAsync is not available on this OxyServices instance');
-        }
-
-        const resolvedUrl = await instance.getFileDownloadUrlAsync(targetFileId, variant, expiresIn);
+        const resolvedUrl = await instance.assets.url(targetFileId, variant, expiresIn);
 
         if (!cancelled) {
           setUrl(resolvedUrl || null);

package/src/ui/hooks/useFollow.ts

@@ -201,7 +201,7 @@ export const useFollow = (userId?: string | string[]) => {
   }, []);
 
   const updateCountsFromFollowAction = useCallback((targetUserId: string, action: 'follow' | 'unfollow', counts: { followers: number; following: number }) => {
-    const currentUserId = oxyServices.getCurrentUserId() || undefined;
+    const currentUserId = oxyServices.session.userId || undefined;
     useFollowStore.getState().updateCountsFromFollowAction(targetUserId, action, counts, currentUserId);
   }, [oxyServices]);
 
@@ -317,7 +317,7 @@ export const useFollowForButton = (userId: string, oxyServices: OxyServices, ini
  * useSeedFollowStatuses — returns a stable callback that bulk-seeds follow
  * statuses into the store (seed-only-if-absent; never clobbers a live value).
  *
- * Wire this at the app root to seed from `oxyServices.getViewerGraph()
+ * Wire this at the app root to seed from `oxyServices.follows.viewerGraph()
  * .followingIds` (map each followed id → `true`) so a page of `FollowButton`s
  * paints the correct label on first render with ZERO follow-status network
  * calls — the batched resolver then skips every seeded id.

package/src/ui/hooks/useFollowTarget.ts

@@ -87,7 +87,7 @@ export function useFollowTarget(
     // user cannot act on.
     if (!targetId || !canUsePrivateApi) return;
     try {
-      const next = await oxyServices.getFollowTargetStatus(targetId);
+      const next = await oxyServices.follows.targetStatus(targetId);
       useFollowTargetStore.getState().setStatus(targetId, next);
       useFollowTargetStore.getState().setError(targetId, undefined);
     } catch (e) {
@@ -160,7 +160,7 @@ export function useFollowTarget(
         // The server returns the whole resulting status, so store it rather
         // than reconstructing one: `effectiveState`'s derivation lives there,
         // and a client recomputing it is a second implementation of one rule.
-        async () => (await oxyServices.followTarget(targetId, opts)).status,
+        async () => (await oxyServices.follows.followTarget(targetId, opts)).status,
         'Could not follow'
       );
     },
@@ -173,7 +173,7 @@ export function useFollowTarget(
     return mutate(
       { ...UNKNOWN_FOLLOW_STATUS },
       async () => {
-        await oxyServices.unfollowTarget(relationshipId);
+        await oxyServices.follows.unfollowTarget(relationshipId);
         return { ...UNKNOWN_FOLLOW_STATUS };
       },
       'Could not unfollow'
@@ -187,7 +187,7 @@ export function useFollowTarget(
     return mutate(
       optimistic,
       async () => {
-        await oxyServices.setFollowApplicationMode(relationshipId, 'disabled');
+        await oxyServices.follows.setApplicationMode(relationshipId, 'disabled');
         return optimistic;
       },
       'Could not change this app’s setting for this follow'
@@ -201,7 +201,7 @@ export function useFollowTarget(
     return mutate(
       optimistic,
       async () => {
-        await oxyServices.restoreFollowInheritance(relationshipId);
+        await oxyServices.follows.restoreInheritance(relationshipId);
         return optimistic;
       },
       'Could not change this app’s setting for this follow'

package/src/ui/hooks/useI18n.ts

@@ -1,6 +1,6 @@
-import { useMemo } from 'react';
+import { useMemo, useSyncExternalStore } from 'react';
 import { useOptionalOxy } from '../context/OxyContext';
-import { translate } from '@oxy.so/core';
+import { getLocalesVersion, subscribeLocales, translate } from '@oxy.so/core';
 
 /**
  * The locale `@oxy.so/core`'s translator falls back to. Mirrors its own
@@ -25,8 +25,11 @@ const FALLBACK_LOCALE = 'en-US';
 export function useI18n() {
   const oxy = useOptionalOxy();
   const currentLanguage = oxy?.currentLanguage ?? FALLBACK_LOCALE;
+  // Core's non-English dictionaries load on demand; re-translate when one lands.
+  const localesVersion = useSyncExternalStore(subscribeLocales, getLocalesVersion, getLocalesVersion);
+  // biome-ignore lint/correctness/useExhaustiveDependencies: `localesVersion` is the re-translate signal — a new `t` makes consumers re-render once a dictionary lands.
   const t = useMemo(() => {
     return (key: string, vars?: Record<string, string | number>) => translate(currentLanguage, key, vars);
-  }, [currentLanguage]);
+  }, [currentLanguage, localesVersion]);
   return { t, locale: currentLanguage };
 }

package/src/ui/hooks/useResolvedFileUrls.ts

@@ -12,16 +12,18 @@ import type { FileMetadata } from '@oxy.so/core';
  * the exact contract it depends on.
  */
 export interface AssetUrlBatchResolver {
-  getFileDownloadUrls(
-    requests: Array<{ fileId: string; variant?: string }>,
-    options?: { expiresIn?: number; context?: string },
-  ): Promise<Record<string, string>>;
+  assets: {
+    urls(
+      requests: Array<{ fileId: string; variant?: string }>,
+      options?: { expiresIn?: number; context?: string },
+    ): Promise<Record<string, string>>;
+  };
 }
 
 /**
  * Private-safe grid/thumbnail URL resolution.
  *
- * The synchronous `oxyServices.getFileDownloadUrl(id, variant)` always yields
+ * The synchronous `oxyServices.assets.publicUrl(id, variant)` always yields
  * the public CDN origin (`cloud.oxy.so/<id>`), which 404s for PRIVATE assets —
  * and uploads default to private. Thumbnails and previews therefore have to be
  * resolved through the authenticated batch endpoint, which returns a working
@@ -148,7 +150,7 @@ export function useResolvedFileUrls(
       const merged: Record<string, string> = {};
       for (let i = 0; i < requests.length; i += BATCH_CAP) {
         const chunk = requests.slice(i, i + BATCH_CAP);
-        const urls = await oxyServices.getFileDownloadUrls(chunk, {
+        const urls = await oxyServices.assets.urls(chunk, {
           expiresIn: ASSET_URL_TTL_SECONDS,
         });
         Object.assign(merged, urls);

package/src/ui/hooks/useSessionManagement.ts

@@ -129,7 +129,7 @@ export const useSessionManagement = ({
     // leaking that stale token onto the shared `oxyClient` singleton after
     // sign-out. Clearing here fires `onTokensChanged(null)`, propagating the
     // logged-out state everywhere.
-    oxyServices.clearTokens();
+    oxyServices.session.clear();
 
     if (queryClient) {
       queryClient.clear();
@@ -157,11 +157,11 @@ export const useSessionManagement = ({
         // `SessionClient` sync) before validating — there is no client-side
         // refresh-cookie slot to fall back on. The native path arrives here only
         // after a bearer has been planted too.
-        if (isWebBrowser() && !oxyServices.getAccessToken()) {
+        if (isWebBrowser() && !oxyServices.session.accessToken) {
           throw new Error('Session is invalid or expired');
         }
 
-        const validation = await oxyServices.validateSession(sessionId, { useHeaderValidation: true });
+        const validation = await oxyServices.session.validate(sessionId, { useHeaderValidation: true });
         if (!validation?.valid) {
           throw new Error('Session is invalid or expired');
         }

package/src/ui/icons/subsetGlyphMaps.ts

@@ -4,7 +4,6 @@ export const ioniconsGlyphMap = {
   "alert": 61714,
   "alert-circle": 61715,
   "alert-circle-outline": 61716,
-  "analytics": 61723,
   "apps": 61729,
   "archive": 61732,
   "arrow-back": 61735,
@@ -12,8 +11,6 @@ export const ioniconsGlyphMap = {
   "arrow-forward": 61747,
   "arrow-up": 61765,
   "at": 61771,
-  "bookmark": 61864,
-  "briefcase": 61873,
   "briefcase-outline": 61874,
   "bug": 61882,
   "bulb": 61888,
@@ -43,7 +40,6 @@ export const ioniconsGlyphMap = {
   "code": 62056,
   "cog": 62068,
   "cog-outline": 62069,
-  "color-palette": 62077,
   "construct-outline": 62087,
   "copy-outline": 62096,
   "cube-outline": 62105,
@@ -73,7 +69,6 @@ export const ioniconsGlyphMap = {
   "grid": 62293,
   "hand-left": 62299,
   "hardware-chip-outline": 62309,
-  "headset": 62311,
   "heart": 62314,
   "heart-outline": 62327,
   "help-circle": 62333,
@@ -119,7 +114,6 @@ export const ioniconsGlyphMap = {
   "school-outline": 62813,
   "search": 62815,
   "search-outline": 62819,
-  "send": 62821,
   "server": 62824,
   "settings": 62827,
   "share-outline": 62834,
@@ -171,8 +165,6 @@ export const materialCommunityIconsGlyphMap = {
   "bell": 983194,
   "bell-outline": 983196,
   "bio": 983206,
-  "bookmark": 983232,
-  "briefcase": 983254,
   "briefcase-outline": 985108,
   "bug": 983268,
   "bullhorn": 983270,
@@ -191,11 +183,9 @@ export const materialCommunityIconsGlyphMap = {
   "cellphone-message": 985299,
   "cellphone-screenshot": 985653,
   "chart-line": 983338,
-  "chat": 985977,
   "check-all": 983341,
   "check-circle": 984544,
   "chevron-down": 983360,
-  "chevron-right": 983362,
   "chevron-up": 983363,
   "chip": 984602,
   "circle-outline": 984934,
@@ -248,13 +238,11 @@ export const materialCommunityIconsGlyphMap = {
   "gift": 986692,
   "gift-outline": 983713,
   "grid": 983745,
-  "headset": 983758,
   "heart": 983761,
   "heart-outline": 983765,
   "help-circle": 983767,
   "help-circle-outline": 984613,
   "history": 983770,
-  "hub": 990357,
   "image": 983785,
   "image-multiple-outline": 983791,
   "image-outline": 985462,
@@ -264,7 +252,6 @@ export const materialCommunityIconsGlyphMap = {
   "label": 983829,
   "leaf": 983850,
   "library": 983857,
-  "lightbulb-on": 984808,
   "link": 983863,
   "link-variant": 983865,
   "loading": 984946,
@@ -276,8 +263,6 @@ export const materialCommunityIconsGlyphMap = {
   "map-marker-outline": 985049,
   "message": 983905,
   "message-outline": 983909,
-  "message-text": 983913,
-  "minus": 983924,
   "minus-circle": 983926,
   "motion": 988594,
   "music-note-outline": 986996,
@@ -308,7 +293,6 @@ export const materialCommunityIconsGlyphMap = {
   "scale": 984178,
   "school-outline": 987520,
   "security": 984195,
-  "send": 984202,
   "server": 984203,
   "share-outline": 985394,
   "shield": 984216,

package/src/ui/navigation/__tests__/getSurfaceConfig.test.ts

@@ -36,7 +36,7 @@ describe('getSurfaceConfig presentation', () => {
         // NAV-WITHIN: drilling into these swaps the content inside ONE surface,
         // which reshapes the panel instead of hard-cutting.
         expect(getSurfaceConfig('ManageAccount', {}).morph).toBe(true);
-        expect(getSurfaceConfig('FAQ', {}).morph).toBe(true);
+        expect(getSurfaceConfig('TrustFAQ', {}).morph).toBe(true);
         expect(getSurfaceConfig('FollowersList', {}).morph).toBe(true);
         expect(getSurfaceConfig('FileManagement', imageOnlyPickerProps).morph).toBe(true);
     });

package/src/ui/navigation/accountDialogManager.ts

@@ -10,7 +10,7 @@
  * view) from a non-React call site.
  */
 
-import type { AccountDialogView } from '@oxy.so/core';
+import type { AccountDialogView } from '@oxy.so/core/session';
 
 /** An app-owned action rendered inside the shared account menu. */
 export interface AccountDialogMenuItem {

package/src/ui/navigation/routes.ts

@@ -12,15 +12,11 @@ export type RouteName =
     | 'SearchSettings'
     | 'FileManagement'
     | 'HelpSupport'
-    | 'FAQ'
-    | 'Feedback'
     | 'LegalDocuments'
     | 'AppInfo'
-    | 'PremiumSubscription'
     | 'WelcomeNewUser'
     | 'UserLinks'
     | 'HistoryView'
-    | 'SavesCollections'
     | 'EditProfile'      // Profile-editing hub: one row per editable field
     | 'EditProfileField' // Dedicated screen for editing a single profile field
     | 'LearnMoreUsernames' // Informational screen about usernames
@@ -39,7 +35,12 @@ export type RouteName =
     | 'AvatarCrop' // Square-crop editor, reached by navigating within the ChangeAvatar surface
     | 'Notifications' // Per-channel notification preferences
     | 'ConnectedApps' // OAuth-authorized third-party apps the user can revoke
+    | 'Domains' // Web domains the identity has proven it controls
     | 'Preferences' // General user preferences (theme, reduce-motion, etc.)
+    | 'DeleteAccount' // Delete an account without a key, with a code by email
+    | 'LinkCommons' // Link Commons: the account becomes self-custodied
+    | 'SignInPassword' // Set or change the account's password
+    | 'SignInAuthenticator' // The account's authenticator app and backup codes
     | 'AccountDialog'; // Unified account switcher + sign-in surface (OxyAccountDialogScreen body)
 
 /**
@@ -79,15 +80,11 @@ const screenComponents: Record<RouteName, ComponentType<never>> = {
     SearchSettings: lazy(() => import('../screens/SearchSettingsScreen')),
     FileManagement: lazy(() => import('../screens/FileManagementScreen')),
     HelpSupport: lazy(() => import('../screens/HelpSupportScreen')),
-    FAQ: lazy(() => import('../screens/FAQScreen')),
-    Feedback: lazy(() => import('../screens/FeedbackScreen')),
     LegalDocuments: lazy(() => import('../screens/LegalDocumentsScreen')),
     AppInfo: lazy(() => import('../screens/AppInfoScreen')),
-    PremiumSubscription: lazy(() => import('../screens/PremiumSubscriptionScreen')),
     WelcomeNewUser: lazy(() => import('../screens/WelcomeNewUserScreen')),
     UserLinks: lazy(() => import('../screens/UserLinksScreen')),
     HistoryView: lazy(() => import('../screens/HistoryViewScreen')),
-    SavesCollections: lazy(() => import('../screens/SavesCollectionsScreen')),
     EditProfile: lazy(() => import('../screens/EditProfileScreen')),
     EditProfileField: lazy(() => import('../screens/EditProfileFieldScreen')),
     // Informational screens
@@ -108,8 +105,14 @@ const screenComponents: Record<RouteName, ComponentType<never>> = {
     ChangeAvatar: lazy(() => import('../screens/ChangeAvatarScreen')),
     AvatarCrop: lazy(() => import('../screens/AvatarCropScreen')),
     Notifications: lazy(() => import('../screens/NotificationsScreen')),
+    Domains: lazy(() => import('../screens/DomainsScreen')),
     ConnectedApps: lazy(() => import('../screens/ConnectedAppsScreen')),
     Preferences: lazy(() => import('../screens/PreferencesScreen')),
+    // The account's own sign-in security, in its settings.
+    DeleteAccount: lazy(() => import('../screens/DeleteAccountScreen')),
+    LinkCommons: lazy(() => import('../screens/LinkCommonsScreen')),
+    SignInPassword: lazy(() => import('../screens/SignInPasswordScreen')),
+    SignInAuthenticator: lazy(() => import('../screens/SignInAuthenticatorScreen')),
     // Unified account switcher + sign-in surface. Its body lives in the
     // `OxyAccountDialogScreen` component (folded from the standalone dialog); the
     // surface stack provides the Dialog chrome around it.

package/src/ui/navigation/surfaceRegistry.ts

@@ -1,5 +1,6 @@
 import type { ReactNode } from 'react';
-import type { AccountDialogView, FileMetadata } from '@oxy.so/core';
+import type { AccountDialogView } from '@oxy.so/core/session';
+import type { FileMetadata } from '@oxy.so/core';
 import type { RouteName } from './routes';
 import type { AvatarCropResult } from '../screens/AvatarCropScreen';
 import type { AvatarRemovalResult } from '../screens/ChangeAvatarScreen';
@@ -38,15 +39,11 @@ export interface SurfaceRegistry {
    */
   FileManagement: SurfaceRoute<Record<string, unknown>, FileMetadata>;
   HelpSupport: SurfaceRoute;
-  FAQ: SurfaceRoute;
-  Feedback: SurfaceRoute;
   LegalDocuments: SurfaceRoute;
   AppInfo: SurfaceRoute;
-  PremiumSubscription: SurfaceRoute;
   WelcomeNewUser: SurfaceRoute;
   UserLinks: SurfaceRoute;
   HistoryView: SurfaceRoute;
-  SavesCollections: SurfaceRoute;
   EditProfile: SurfaceRoute;
   EditProfileField: SurfaceRoute;
   LearnMoreUsernames: SurfaceRoute;
@@ -56,6 +53,7 @@ export interface SurfaceRegistry {
   TrustRules: SurfaceRoute;
   AboutTrust: SurfaceRoute;
   TrustFAQ: SurfaceRoute;
+  Domains: SurfaceRoute;
   FollowersList: SurfaceRoute;
   FollowingList: SurfaceRoute;
   CreateAccount: SurfaceRoute;
@@ -76,6 +74,10 @@ export interface SurfaceRegistry {
   Notifications: SurfaceRoute;
   ConnectedApps: SurfaceRoute;
   Preferences: SurfaceRoute;
+  DeleteAccount: SurfaceRoute;
+  LinkCommons: SurfaceRoute;
+  SignInPassword: SurfaceRoute;
+  SignInAuthenticator: SurfaceRoute;
   /** Unified account switcher + sign-in surface (folded `OxyAccountDialogScreen` body). */
   AccountDialog: SurfaceRoute<{ initialView?: AccountDialogView }>;
 }
@@ -234,7 +236,7 @@ const isFileManagementImageOnlyPicker = (props: Record<string, unknown>): boolea
  * (`scrollable: false`) so there is exactly ONE scroll container — otherwise a
  * VirtualizedList nests inside a plain ScrollView (RN warning) or a nested
  * vertical scroll-in-scroll breaks windowing. Screens with only a HORIZONTAL
- * ScrollView (FAQ's category row, Premium's plan carousel) are NOT listed — a
+ * ScrollView are NOT listed — a
  * horizontal scroller does not conflict with the Dialog's vertical scroll.
  */
 const OWN_SCROLL_CONTAINER_ROUTES: ReadonlySet<RouteName> = new Set<RouteName>([

package/src/ui/oauth/__tests__/browserAuthTransport.test.ts

@@ -58,13 +58,13 @@ function makeContext(
   const commitSession = jest.fn().mockResolvedValue(undefined);
   const base: WebOAuthTransportContext = {
     mode: 'popup',
-    oxyServices: { exchangeOAuthCode } as unknown as OxyServices,
+    oxyServices: { auth: { oauth: { exchangeCode: exchangeOAuthCode } } } as unknown as OxyServices,
     clientId: CLIENT_ID,
     authorizeBaseUrl: AUTHORIZE_BASE_URL,
     identityBound: false,
     commitSession,
   };
-  return { ...base, ...overrides, exchangeOAuthCode, commitSession };
+  return { ...base, ...overrides, auth: { oauth: { exchangeCode: exchangeOAuthCode } }, commitSession };
 }
 
 /** Wait for the transport to finish preparing PKCE and navigate the popup. */
@@ -120,7 +120,7 @@ describe('startWebOAuthSignIn', () => {
 
       // The verifier the main window replays is the one behind the challenge it
       // sent — the popup never saw either.
-      const exchangeArgs = context.exchangeOAuthCode.mock.calls[0][0];
+      const exchangeArgs = context.auth.oauth.exchangeCode.mock.calls[0][0];
       expect(exchangeArgs.code).toBe('code-1');
       expect(exchangeArgs.redirectUri).toBe(REDIRECT_URI);
       await expect(computeCodeChallenge(exchangeArgs.codeVerifier)).resolves.toBe(
@@ -192,7 +192,7 @@ describe('startWebOAuthSignIn', () => {
         url.searchParams.get('state'),
       );
       expect(sessionStorage.getItem(OXY_OAUTH_CODE_VERIFIER_STORAGE_KEY)).toBeTruthy();
-      expect(context.exchangeOAuthCode).not.toHaveBeenCalled();
+      expect(context.auth.oauth.exchangeCode).not.toHaveBeenCalled();
     });
 
     it('falls back to a full-page redirect when the popup cannot be navigated', async () => {
@@ -235,7 +235,7 @@ describe('startWebOAuthSignIn', () => {
         reason: 'idp-error',
         description: 'user declined',
       });
-      expect(context.exchangeOAuthCode).not.toHaveBeenCalled();
+      expect(context.auth.oauth.exchangeCode).not.toHaveBeenCalled();
       expect(popup.close).toHaveBeenCalled();
     });
 
@@ -251,7 +251,7 @@ describe('startWebOAuthSignIn', () => {
       );
 
       await expect(pending).resolves.toEqual({ status: 'failed', reason: 'state-mismatch' });
-      expect(context.exchangeOAuthCode).not.toHaveBeenCalled();
+      expect(context.auth.oauth.exchangeCode).not.toHaveBeenCalled();
       expect(context.commitSession).not.toHaveBeenCalled();
     });
 
@@ -267,12 +267,12 @@ describe('startWebOAuthSignIn', () => {
 
       expect(result).toEqual({ status: 'timed-out' });
       expect(popup.close).toHaveBeenCalled();
-      expect(context.exchangeOAuthCode).not.toHaveBeenCalled();
+      expect(context.auth.oauth.exchangeCode).not.toHaveBeenCalled();
     });
 
     it('reports a failed exchange', async () => {
       const context = makeContext();
-      context.exchangeOAuthCode.mockRejectedValue(new Error('invalid_grant'));
+      context.auth.oauth.exchangeCode.mockRejectedValue(new Error('invalid_grant'));
       const popup = fakePopup();
 
       const pending = startWebOAuthSignIn(context, { redirectUri: REDIRECT_URI, popup });