@oxyhq/services 15.0.0 → 17.0.0

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/screens/ManageAccountScreen.tsx

@@ -78,7 +78,7 @@ const formatRelative = (dateString?: string): string => {
  * Replaces AccountOverview + AccountSettings + the per-account half of
  * SessionManagement. Lists ONLY the active user's profile, sessions on this
  * device, and security/destructive actions for THIS account. Multi-account
- * surface lives in {@link AccountSwitcher} — keep these concerns separate.
+ * surface lives in the unified `OxyAccountDialog` — keep these concerns separate.
  */
 const ManageAccountScreen: React.FC<BaseScreenProps> = ({
     onClose,
@@ -95,6 +95,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
         logout,
         openAvatarPicker,
         accounts,
+        openAccountDialog,
     } = useOxy();
 
     const { data: userFromQuery, isLoading: userLoading } = useCurrentUser({
@@ -700,7 +701,7 @@ const ManageAccountScreen: React.FC<BaseScreenProps> = ({
                                         || 'Accounts you own or share'
                                     )
                             }
-                            onPress={() => navigate?.('AccountSwitcher')}
+                            onPress={() => openAccountDialog('accounts')}
                         />
                         <SettingsListItem
                             icon={

package/src/ui/session/createSessionClient.ts

@@ -4,6 +4,7 @@ import {
   createSessionClientHost,
   type AuthStateStore,
   type OxyServices,
+  type SessionClientOptions,
 } from '@oxyhq/core';
 import { createTokenTransport } from './tokenTransport';
 
@@ -31,12 +32,19 @@ export function createSessionClient(
   oxyServices: OxyServices,
   store: AuthStateStore,
   onUnauthenticated?: () => void,
+  /**
+   * Optional signed-out realtime wiring: `signedOutSocketAuth` (open the socket
+   * while signed out — web returns `true` to ride the `oxy_device` cookie,
+   * native returns the shared device token) and `onSessionAppeared` (self-acquire
+   * when a sibling signs in on this device).
+   */
+  extra?: Pick<SessionClientOptions, 'signedOutSocketAuth' | 'onSessionAppeared'>,
 ): {
   client: SessionClient;
   host: ReturnType<typeof createSessionClientHost>;
 } {
   const host = createSessionClientHost(oxyServices);
   const transport = createTokenTransport(oxyServices, store);
-  const client = new SessionClient(host, { transport, socketFactory: io, onUnauthenticated });
+  const client = new SessionClient(host, { transport, socketFactory: io, onUnauthenticated, ...extra });
   return { client, host };
 }

package/src/ui/types/navigation.ts

@@ -63,4 +63,13 @@ export interface OxyProviderProps {
     authWebUrl?: string;
     authRedirectUri?: string;
     queryClient?: QueryClient;
+    /**
+     * Convenience: wrap the whole app subtree in `<RequireOxyAuth prompt=...>`.
+     * `off` (default) renders children unconditionally; `soft` adds a dismissible
+     * sign-in banner while signed out; `hard` blocks the app behind the signed-out
+     * wall until the user signs in. For finer control, mount `RequireOxyAuth`
+     * yourself around a specific subtree instead.
+     * @default 'off'
+     */
+    requireAuth?: 'off' | 'soft' | 'hard';
 }

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;
 }