@oxyhq/services 15.0.0 → 16.0.0

package/lib/typescript/module/ui/utils/storageHelpers.d.ts

@@ -10,13 +10,13 @@ export interface SessionStorageKeys {
     language: string;
     /**
      * DURABLE "this device/app has had a signed-in Oxy session before" hint.
-     *
-     * Lives in the SAME `storageKeyPrefix`-scoped durable store as the stored
-     * session ids, so it survives a session expiring (cleared only on explicit
-     * full sign-out). Read at cold boot to drive the smart `sso-bounce` gate:
-     * a returning visitor still gets ONE establish bounce so a central-only
-     * cross-domain session recovers, while a first-time anonymous visitor is
-     * never force-redirected. See `allowSsoBounce` in `@oxyhq/core`.
+     * Originally read at cold boot to drive the FedCM-era smart `sso-bounce`
+     * gate (a returning visitor still got one establish bounce; a first-time
+     * anonymous visitor was never force-redirected). That gate and
+     * `allowSsoBounce` were deleted in the device-first cutover — this storage
+     * key is currently defined but not read anywhere; kept rather than removed
+     * here since deleting a storage key is a logic change, out of scope for a
+     * comment sweep. Flag for a follow-up dead-field cleanup.
      */
     priorSession: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "15.0.0",
+  "version": "16.0.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -106,10 +106,10 @@
     }
   },
   "dependencies": {
-    "@oxyhq/contracts": "0.9.1"
+    "@oxyhq/contracts": "0.10.0"
   },
   "devDependencies": {
-    "@oxyhq/core": "^6.0.0",
+    "@oxyhq/core": "^7.0.0",
     "nativewind": "5.0.0-preview.3",
     "react-native-css": "^3.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
@@ -153,7 +153,7 @@
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxyhq/bloom": ">=0.16.0",
-    "@oxyhq/core": "^6.0.0",
+    "@oxyhq/core": "^7.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@tanstack/query-async-storage-persister": "^5.101",

package/src/index.ts

@@ -77,7 +77,7 @@ export {
     useUserByUsername,
     useUsersBySessions,
     usePrivacySettings,
-    useAuthorizedApps,
+    useConnectedApps,
 } from './ui/hooks/queries/useAccountQueries';
 export {
     useSessions,
@@ -124,7 +124,7 @@ export {
     useUpdatePrivacySettings,
     useUpdateNotificationPreferences,
     useUpdateUserPreferences,
-    useRevokeAuthorizedApp,
+    useRevokeConnectedApp,
     useUploadFile,
 } from './ui/hooks/mutations/useAccountMutations';
 export {

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

@@ -32,7 +32,7 @@ export const mutationKeys = {
     removeDevice: ['mutation', 'session', 'removeDevice'] as const,
   },
 
-  // Connected apps (FedCM grants)
+  // Connected apps (OAuth grants)
   connectedApps: {
     revoke: ['mutation', 'connectedApps', 'revoke'] as const,
   },

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

@@ -632,20 +632,20 @@ export const useUpdateUserPreferences = () => {
 };
 
 /**
- * Revoke the authenticated user's authorization for a specific RP origin.
- * Removes the FedCM grant so the origin no longer appears in the user's
- * "Connected apps" list — next sign-in from that origin will require explicit
+ * Revoke the current user's grant for a connected application (by its
+ * `applicationId`). Removes the grant so the app no longer appears in the user's
+ * "Connected apps" list — next sign-in for that app will require explicit
  * re-consent.
  */
-export const useRevokeAuthorizedApp = () => {
+export const useRevokeConnectedApp = () => {
   const { oxyServices, activeSessionId } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationKey: [...mutationKeys.connectedApps.revoke],
-    mutationFn: async (origin: string) => {
+    mutationFn: async (applicationId: string) => {
       return authenticatedApiCall<void>(oxyServices, activeSessionId, () =>
-        oxyServices.revokeAuthorizedApp(origin)
+        oxyServices.revokeAppGrant(applicationId)
       );
     },
     onSuccess: () => {
@@ -653,7 +653,7 @@ export const useRevokeAuthorizedApp = () => {
     },
     onError: (error) => {
       toast.error(
-        error instanceof Error ? error.message : 'Failed to revoke authorized app'
+        error instanceof Error ? error.message : 'Failed to revoke connected app'
       );
     },
   });

package/src/ui/hooks/queries/queryKeys.ts

@@ -77,7 +77,7 @@ export const queryKeys = {
     usage: (accountScope?: string) => [...queryKeys.storage.all, 'usage', accountScope] as const,
   },
 
-  // Connected apps (FedCM grants the user has authorized)
+  // Connected apps (OAuth grants the user has authorized)
   connectedApps: {
     all: ['connectedApps'] as const,
     list: () => [...queryKeys.connectedApps.all, 'list'] as const,

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useQuery, useQueries, useQueryClient } from '@tanstack/react-query';
 import { authenticatedApiCall } from '@oxyhq/core';
-import type { AuthorizedApp, User } from '@oxyhq/core';
+import type { ConnectedApp, User } from '@oxyhq/core';
 import { queryKeys } from './queryKeys';
 import { mutationKeys } from '../mutations/mutationKeys';
 import { useOxy } from '../../context/OxyContext';
@@ -205,21 +205,20 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
 };
 
 /**
- * List the authenticated user's authorized RP apps (FedCM grants).
- *
- * Returns the intersection of the user's grants with the currently-approved
- * RP catalog. Drives the "Connected apps" management screen.
+ * List the third-party OAuth applications the current user has connected via
+ * the consent flow (`GET /auth/grants`). Drives the "Connected apps" management
+ * screen.
  */
-export const useAuthorizedApps = (options?: { enabled?: boolean }) => {
+export const useConnectedApps = (options?: { enabled?: boolean }) => {
   const { oxyServices, activeSessionId, isAuthenticated } = useOxy();
 
-  return useQuery<AuthorizedApp[]>({
+  return useQuery<ConnectedApp[]>({
     queryKey: queryKeys.connectedApps.list(),
     queryFn: async () => {
-      return authenticatedApiCall<AuthorizedApp[]>(
+      return authenticatedApiCall<ConnectedApp[]>(
         oxyServices,
         activeSessionId,
-        () => oxyServices.listAuthorizedApps()
+        () => oxyServices.listConnectedApps()
       );
     },
     enabled: (options?.enabled !== false) && isAuthenticated,

package/src/ui/navigation/routes.ts

@@ -43,7 +43,7 @@ export type RouteName =
     | 'AccountSettings' // Per-account profile edit + members + danger zone
     | 'AvatarCrop' // Square-crop editor presented before avatar upload
     | 'Notifications' // Per-channel notification preferences
-    | 'ConnectedApps' // FedCM-authorized RP apps the user can revoke
+    | 'ConnectedApps' // OAuth-authorized third-party apps the user can revoke
     | 'Preferences'; // General user preferences (theme, reduce-motion, etc.)
 
 // Lazy screen loaders - functions that return screen components on-demand

package/src/ui/screens/ConnectedAppsScreen.tsx

@@ -3,7 +3,7 @@ import { ActivityIndicator, FlatList, RefreshControl, StyleSheet, View } from 'r
 import { Dialog, toast, useDialogControl } from '@oxyhq/bloom';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';
-import type { AuthorizedApp } from '@oxyhq/core';
+import type { ConnectedApp } from '@oxyhq/core';
 import { logger as loggerUtil } from '@oxyhq/core';
 import type { BaseScreenProps } from '../types/navigation';
 import Header from '../components/Header';
@@ -12,8 +12,8 @@ import EmptyState from '../components/EmptyState';
 import LoadingState from '../components/LoadingState';
 import { useI18n } from '../hooks/useI18n';
 import { useOxy } from '../context/OxyContext';
-import { useAuthorizedApps } from '../hooks/queries/useAccountQueries';
-import { useRevokeAuthorizedApp } from '../hooks/mutations/useAccountMutations';
+import { useConnectedApps } from '../hooks/queries/useAccountQueries';
+import { useRevokeConnectedApp } from '../hooks/mutations/useAccountMutations';
 
 const APP_ICON_SIZE = 40;
 
@@ -39,12 +39,11 @@ const formatRelative = (iso: string): string => {
 };
 
 /**
- * ConnectedAppsScreen — list and revoke FedCM-authorized RP applications.
+ * ConnectedAppsScreen — list and revoke connected OAuth applications.
  *
- * Fetches via `useAuthorizedApps` (drives `GET /fedcm/me/authorized-apps`)
- * and exposes a "Revoke" action that hits `DELETE /fedcm/me/authorized-apps/
- * :origin`. Each revoke invalidates the connected-apps query so the list
- * refreshes immediately.
+ * Fetches via `useConnectedApps` (drives `GET /auth/grants`) and exposes a
+ * "Revoke" action that hits `DELETE /auth/grants/:applicationId`. Each revoke
+ * invalidates the connected-apps query so the list refreshes immediately.
  */
 const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) => {
     const bloomTheme = useTheme();
@@ -55,14 +54,14 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
         isLoading,
         refetch,
         isRefetching,
-    } = useAuthorizedApps({ enabled: isAuthenticated });
-    const revokeMutation = useRevokeAuthorizedApp();
+    } = useConnectedApps({ enabled: isAuthenticated });
+    const revokeMutation = useRevokeConnectedApp();
     const revokeDialog = useDialogControl();
-    const [pendingRevoke, setPendingRevoke] = useState<AuthorizedApp | null>(null);
-    const [revokingOrigin, setRevokingOrigin] = useState<string | null>(null);
+    const [pendingRevoke, setPendingRevoke] = useState<ConnectedApp | null>(null);
+    const [revokingAppId, setRevokingAppId] = useState<string | null>(null);
 
     const confirmRevoke = useCallback(
-        (app: AuthorizedApp) => {
+        (app: ConnectedApp) => {
             setPendingRevoke(app);
             revokeDialog.open();
         },
@@ -74,16 +73,16 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
             return;
         }
         const target = pendingRevoke;
-        setRevokingOrigin(target.origin);
+        setRevokingAppId(target.applicationId);
         try {
-            await revokeMutation.mutateAsync(target.origin);
+            await revokeMutation.mutateAsync(target.applicationId);
             toast.success(
                 t('connectedApps.toasts.revoked', { name: target.name })
                 || `Revoked access for ${target.name}`,
             );
         } catch (error) {
             loggerUtil.warn(
-                'Revoke authorized app failed',
+                'Revoke connected app failed',
                 { component: 'ConnectedAppsScreen' },
                 error,
             );
@@ -92,7 +91,7 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
                 || 'Failed to revoke access',
             );
         } finally {
-            setRevokingOrigin(null);
+            setRevokingAppId(null);
             setPendingRevoke(null);
         }
     }, [pendingRevoke, revokeMutation, t]);
@@ -113,18 +112,18 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
     );
 
     const renderItem = useCallback(
-        ({ item }: { item: AuthorizedApp }) => {
-            const isRevoking = revokingOrigin === item.origin;
+        ({ item }: { item: ConnectedApp }) => {
+            const isRevoking = revokingAppId === item.applicationId;
             return (
                 <SettingsListGroup>
                     <SettingsListItem
                         icon={<Avatar name={item.name} size={APP_ICON_SIZE} />}
                         title={item.name}
                         description={
-                            t('connectedApps.item.lastUsed', {
-                                relative: formatRelative(item.lastUsedAt),
+                            t('connectedApps.item.granted', {
+                                relative: formatRelative(item.firstGrantedAt),
                             })
-                            || `Last used ${formatRelative(item.lastUsedAt)}`
+                            || `Granted ${formatRelative(item.firstGrantedAt)}`
                         }
                         onPress={isRevoking ? undefined : () => confirmRevoke(item)}
                         disabled={isRevoking}
@@ -142,7 +141,7 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
                 </SettingsListGroup>
             );
         },
-        [bloomTheme.colors.error, confirmRevoke, revokingOrigin, t],
+        [bloomTheme.colors.error, confirmRevoke, revokingAppId, t],
     );
 
     return (
@@ -158,7 +157,7 @@ const ConnectedAppsScreen: React.FC<BaseScreenProps> = ({ onClose, goBack }) =>
             ) : (
                 <FlatList
                     data={apps ?? []}
-                    keyExtractor={(item) => item.origin}
+                    keyExtractor={(item) => item.applicationId}
                     renderItem={renderItem}
                     contentContainerClassName="px-screen-margin py-space-16"
                     contentContainerStyle={styles.listContent}

package/src/ui/utils/storageHelpers.ts

@@ -11,13 +11,13 @@ export interface SessionStorageKeys {
   language: string;
   /**
    * DURABLE "this device/app has had a signed-in Oxy session before" hint.
-   *
-   * Lives in the SAME `storageKeyPrefix`-scoped durable store as the stored
-   * session ids, so it survives a session expiring (cleared only on explicit
-   * full sign-out). Read at cold boot to drive the smart `sso-bounce` gate:
-   * a returning visitor still gets ONE establish bounce so a central-only
-   * cross-domain session recovers, while a first-time anonymous visitor is
-   * never force-redirected. See `allowSsoBounce` in `@oxyhq/core`.
+   * Originally read at cold boot to drive the FedCM-era smart `sso-bounce`
+   * gate (a returning visitor still got one establish bounce; a first-time
+   * anonymous visitor was never force-redirected). That gate and
+   * `allowSsoBounce` were deleted in the device-first cutover — this storage
+   * key is currently defined but not read anywhere; kept rather than removed
+   * here since deleting a storage key is a logic change, out of scope for a
+   * comment sweep. Flag for a follow-up dead-field cleanup.
    */
   priorSession: string;
 }