@oxyhq/services 15.0.0 → 17.0.0

package/lib/module/ui/hooks/mutations/mutationKeys.js

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

package/lib/module/ui/hooks/mutations/useAccountMutations.js

@@ -99,7 +99,7 @@ export const useUpdateProfile = () => {
         refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
       }
 
-      // Invalidate all related queries so every consumer (AccountSwitcher,
+      // Invalidate all related queries so every consumer (the account dialog,
       // session lists, managed accounts, etc.) refetches the fresh profile.
       // This is critical right after `username` is set the first time, when
       // every cached "session profile" still reports the user as unnamed.
@@ -624,12 +624,12 @@ 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
@@ -637,14 +637,14 @@ export const useRevokeAuthorizedApp = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationKey: [...mutationKeys.connectedApps.revoke],
-    mutationFn: async origin => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.revokeAuthorizedApp(origin));
+    mutationFn: async applicationId => {
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.revokeAppGrant(applicationId));
     },
     onSuccess: () => {
       invalidateConnectedAppsQueries(queryClient);
     },
     onError: error => {
-      toast.error(error instanceof Error ? error.message : 'Failed to revoke authorized app');
+      toast.error(error instanceof Error ? error.message : 'Failed to revoke connected app');
     }
   });
 };

package/lib/module/ui/hooks/mutations/useAccountMutations.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","optimisticUser","name","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeAuthorizedApp","connectedApps","revoke","origin","revokeAuthorizedApp","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","optimisticUser","name","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeConnectedApp","connectedApps","revoke","applicationId","revokeAppGrant","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,cAAc,QAAQ,uBAAuB;AACnE,SAASC,oBAAoB,QAAQ,aAAa;AASlD,SACEC,SAAS,EACTC,wBAAwB,EACxBC,8BAA8B,EAC9BC,qBAAqB,EACrBC,wBAAwB,QACnB,yBAAsB;AAC7B,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,MAAM,QAAQ,6BAA0B;AACjD,SAASC,KAAK,QAAQ,cAAc;AACpC,SAASC,oBAAoB,QAAQ,4BAAyB;AAC9D,SAASC,YAAY,QAAQ,2BAAwB;;AAErD;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EACpC,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGP,MAAM,CAAC,CAAC;EACvD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAACC,aAAa,CAAC;IACpDC,UAAU,EAAE,MAAOC,OAA0B,IAAK;MAChD,OAAOpB,oBAAoB,CACzBY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAACM,aAAa,CAACE,OAAO,CACzC,CAAC;IACH,CAAC;IACD;IACAC,QAAQ,EAAE,MAAOD,OAAO,IAAK;MAC3B;MACA,MAAML,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe;MAAE,CAAC,CAAC;;MAE1F;MACA,MAAMa,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;;MAEhG;MACA,IAAIa,YAAY,EAAE;QAChB,MAAME,cAAoB,GAAG;UAC3B,GAAGF,YAAY;UACf,GAAGN,OAAO;UACVS,IAAI,EAAET,OAAO,CAACS,IAAI,GACd;YAAE,GAAGH,YAAY,CAACG,IAAI;YAAE,GAAGT,OAAO,CAACS;UAAK,CAAC,GACzCH,YAAY,CAACG;QACnB,CAAC;QACDd,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEe,cAAc,CAAC;;QAE3F;QACA,IAAIf,eAAe,EAAE;UACnBE,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAEe,cAAc,CAAC;QAC1F;MACF;MAEA,OAAO;QAAEF;MAAa,CAAC;IACzB,CAAC;IACD;IACAO,OAAO,EAAEA,CAACC,KAAK,EAAEd,OAAO,EAAEe,OAAO,KAAK;MACpC,IAAIA,OAAO,EAAET,YAAY,IAAIN,OAAO,EAAE;QACpC,MAAMM,YAAY,GAAGS,OAAO,CAACT,YAAY;QACzC,MAAMU,WAAW,GAAGC,MAAM,CAACC,IAAI,CAAClB,OAAO,CAAsB;QAC7D,MAAMmB,eAAe,GAAGH,WAAW,CAACI,MAAM,CAAgB,CAACC,GAAG,EAAEC,GAAG,KAAK;UACrED,GAAG,CAA6BC,GAAG,CAAW,GAAGhB,YAAY,CAACgB,GAAG,CAAC;UACnE,OAAOD,GAAG;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAMhB,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACV,GAAGc;UACL,CAAC,CAAC;QACJ;QACA,IAAI1B,eAAe,EAAE;UACnB,MAAM8B,cAAc,GAAG5B,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,CAAC;UAC/F,IAAI8B,cAAc,EAAE;YAClB5B,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAE;cACvE,GAAG8B,cAAc;cACjB,GAAGJ;YACL,CAAC,CAAC;UACJ;QACF;MACF;MACA/B,KAAK,CAAC0B,KAAK,CAACA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,0BAA0B,CAAC;IAClF,CAAC;IACD;IACAC,SAAS,EAAEA,CAACC,IAAI,EAAE3B,OAAO,KAAK;MAC5B;MACAL,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC3E,IAAIlC,eAAe,EAAE;QACnBE,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC1E;;MAEA;MACArC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACF,IAAI,CAAC;;MAErC;MACA,IAAI3B,OAAO,CAAC8B,MAAM,IAAIrC,eAAe,IAAID,WAAW,EAAE;QACpDH,oBAAoB,CAACI,eAAe,EAAEO,OAAO,CAAC8B,MAAM,EAAEtC,WAAW,CAAC;MACpE;;MAEA;MACA;MACA;MACA;MACAR,qBAAqB,CAACW,WAAW,CAAC;MAClCb,wBAAwB,CAACa,WAAW,CAAC;MACrCV,wBAAwB,CAACU,WAAW,CAAC;IACvC;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMoC,eAAe,GAAGA,CAAA,KAAM;EACnC,MAAM;IAAEvC,WAAW;IAAEC;EAAgB,CAAC,GAAGN,MAAM,CAAC,CAAC;EACjD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAACmC,YAAY,CAAC;IACnDjC,UAAU,EAAE,MAAOkC,IAAkE,IAAK;MACxF,OAAOrD,oBAAoB,CAAOY,WAAW,EAAEC,eAAe,EAAE,YAAY;QAC1E,MAAMyC,YAAY,GAAG,MAAM1C,WAAW,CAAC2C,WAAW,CAACF,IAAI,EAAE,QAAQ,CAAC;QAClE,MAAMG,MAAM,GAAGF,YAAY,EAAED,IAAI,EAAEI,EAAE;QAErC,IAAI,CAACD,MAAM,IAAI,OAAOA,MAAM,KAAK,QAAQ,EAAE;UACzC,MAAM,IAAIZ,KAAK,CAAC,yDAAyD,CAAC;QAC5E;;QAEA;QACA,OAAO,MAAMhC,WAAW,CAACM,aAAa,CAAC;UAAEgC,MAAM,EAAEM;QAAO,CAAC,CAAC;MAC5D,CAAC,CAAC;IACJ,CAAC;IACDnC,QAAQ,EAAE,MAAOgC,IAAI,IAAK;MACxB,MAAMtC,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe;MAAE,CAAC,CAAC;MAC1F,MAAMa,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;;MAEhG;MACA,IAAIa,YAAY,EAAE;QAChB,MAAME,cAAc,GAAG;UACrB,GAAGF,YAAY;UACfwB,MAAM,EAAEG,IAAI,CAACK,GAAG,CAAE;QACpB,CAAC;QACD3C,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEe,cAAc,CAAC;QAC3F,IAAIf,eAAe,EAAE;UACnBE,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAEe,cAAc,CAAC;QAC1F;MACF;MAEA,OAAO;QAAEF;MAAa,CAAC;IACzB,CAAC;IACDO,OAAO,EAAEA,CAACC,KAAK,EAAEyB,KAAK,EAAExB,OAAO,KAAK;MAClC;MACA,IAAIA,OAAO,EAAET,YAAY,EAAE;QACzB,MAAMkC,cAAc,GAAGzB,OAAO,CAACT,YAAY,CAACwB,MAAM;QAClD,MAAMzB,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACVyB,MAAM,EAAEU;UACV,CAAC,CAAC;QACJ;QACA,IAAI/C,eAAe,EAAE;UACnB,MAAM8B,cAAc,GAAG5B,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,CAAC;UAC/F,IAAI8B,cAAc,EAAE;YAClB5B,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAE;cACvE,GAAG8B,cAAc;cACjBO,MAAM,EAAEU;YACV,CAAC,CAAC;UACJ;QACF;MACF;MACApD,KAAK,CAAC0B,KAAK,CAACA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,yBAAyB,CAAC;IACjF,CAAC;IACDC,SAAS,EAAGC,IAAI,IAAK;MACnBhC,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC3E,IAAIlC,eAAe,EAAE;QACnBE,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAAC8B,KAAK,CAACC,OAAO,CAACnB,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC1E;;MAEA;MACArC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACF,IAAI,CAAC;;MAErC;MACA,IAAIA,IAAI,EAAEG,MAAM,IAAIrC,eAAe,IAAID,WAAW,EAAE;QAClDH,oBAAoB,CAACI,eAAe,EAAEkC,IAAI,CAACG,MAAM,EAAEtC,WAAW,CAAC;MACjE;;MAEA;MACA;MACAR,qBAAqB,CAACW,WAAW,CAAC;MAClCb,wBAAwB,CAACa,WAAW,CAAC;MACrCV,wBAAwB,CAACU,WAAW,CAAC;MACrCP,KAAK,CAACqD,OAAO,CAAC,6BAA6B,CAAC;IAC9C;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KAAM;EAC5C,MAAM;IAAElD,WAAW;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGP,MAAM,CAAC,CAAC;EACvD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,MAAMgE,QAAQ,GAAGjE,WAAW,CAAC;IAC3BkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAAC+C,cAAc,CAAC;IACrD7C,UAAU,EAAE,MAAAA,CAAO;MAAEC,OAAO;MAAE6C;IAA4C,CAAC,KAAK;MAC9E,MAAMC,MAAM,GAAGD,WAAW,CAACR,EAAE;MAC7B,IAAI,CAACS,MAAM,EAAE;QACX,MAAM,IAAItB,KAAK,CAAC,gDAAgD,CAAC;MACnE;MACA,MAAMuB,cAAc,GAAG,MAAMnE,oBAAoB,CAC/CY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAACwD,qBAAqB,CAAChD,OAAO,EAAE8C,MAAM,CACzD,CAAC;MACD;MACA;MACA;MACA;MACA,OAAO;QACL,GAAGD,WAAW;QACdI,eAAe,EAAEF;MACnB,CAAC;IACH,CAAC;IACD9C,QAAQ,EAAE,MAAAA,CAAO;MAAED;IAAQ,CAAC,KAAK;MAC/B,MAAML,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAAC8C,QAAQ,CAAC;MAAE,CAAC,CAAC;MAC5E,MAAM5C,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MAEhG,IAAIa,YAAY,EAAE;QAChBX,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;UAC1E,GAAGa,YAAY;UACf2C,eAAe,EAAE;YACf,GAAG3C,YAAY,CAAC2C,eAAe;YAC/B,GAAGjD;UACL;QACF,CAAC,CAAC;MACJ;MAEA,OAAO;QAAEM;MAAa,CAAC;IACzB,CAAC;IACDO,OAAO,EAAEA,CAACC,KAAK,EAAE;MAAEd;IAAQ,CAAC,EAAEe,OAAO,KAAK;MACxC;MACA,IAAIA,OAAO,EAAET,YAAY,IAAIN,OAAO,EAAE;QACpC,MAAMmD,eAAe,GAAGpC,OAAO,CAACT,YAAY,CAAC2C,eAAe,IAAI,CAAC,CAAC;QAClE,MAAMjC,WAAW,GAAGC,MAAM,CAACC,IAAI,CAAClB,OAAO,CAAiC;QACxE,MAAMoD,sBAAsB,GAAGpC,WAAW,CAACI,MAAM,CAA2B,CAACC,GAAG,EAAEC,GAAG,KAAK;UACvFD,GAAG,CAA6BC,GAAG,CAAW,GAAI6B,eAAe,CAA6B7B,GAAG,CAAW;UAC7G,OAAOD,GAAG;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAMhB,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACV4C,eAAe,EAAE;cACf,IAAI5C,OAAO,CAAC4C,eAAe,IAAI,CAAC,CAAC,CAAC;cAClC,GAAGG;YACL;UACF,CAAC,CAAC;QACJ;MACF;MACAhE,KAAK,CAAC0B,KAAK,CAACA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,2BAA2B,CAAC;IACnF,CAAC;IACDC,SAAS,EAAGC,IAAI,IAAK;MACnBhC,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEkC,IAAI,CAAC;;MAE3E;MACArC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACF,IAAI,CAAC;MAErC7C,wBAAwB,CAACa,WAAW,CAAC;MACrCP,KAAK,CAACqD,OAAO,CAAC,+BAA+B,CAAC;IAChD,CAAC;IACDY,SAAS,EAAEA,CAAA,KAAM;MACf1D,WAAW,CAAC2D,iBAAiB,CAAC;QAAEnD,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAAC8C,QAAQ,CAAC;MAAE,CAAC,CAAC;IAC5E;EACF,CAAC,CAAC;;EAEF;EACA;EACA;EACA;EACA,OAAO;IACL,GAAGP,QAAQ;IACXY,MAAM,EAAGvD,OAAiC,IAAW;MACnD,MAAM6C,WAAW,GAAGnD,IAAI,IAAIC,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MACvG,IAAI,CAACoD,WAAW,EAAE;QAChBzD,KAAK,CAAC0B,KAAK,CAAC,iDAAiD,CAAC;QAC9D;MACF;MACA6B,QAAQ,CAACY,MAAM,CAAC;QAAEvD,OAAO;QAAE6C;MAAY,CAAC,CAAC;IAC3C,CAAC;IACDW,WAAW,EAAE,MAAOxD,OAAiC,IAAoB;MACvE,MAAM6C,WAAW,GAAGnD,IAAI,IAAIC,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MACvG,IAAI,CAACoD,WAAW,EAAE;QAChB,MAAM,IAAIrB,KAAK,CAAC,iDAAiD,CAAC;MACpE;MACA,OAAOmB,QAAQ,CAACa,WAAW,CAAC;QAAExD,OAAO;QAAE6C;MAAY,CAAC,CAAC;IACvD;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMY,wBAAwB,GAAGA,CAAA,KAAM;EAC5C,MAAM;IAAEjE,WAAW;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGP,MAAM,CAAC,CAAC;EACvD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAACmD,qBAAqB,CAAC;IAC5DjD,UAAU,EAAE,MAAAA,CAAO;MAAEmD,QAAQ;MAAEJ;IAAgE,CAAC,KAAK;MACnG,MAAMY,YAAY,GAAGZ,MAAM,IAAIpD,IAAI,EAAE2C,EAAE;MACvC,IAAI,CAACqB,YAAY,EAAE;QACjB,MAAM,IAAIlC,KAAK,CAAC,qBAAqB,CAAC;MACxC;MAEA,OAAO5C,oBAAoB,CACzBY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAACwD,qBAAqB,CAACE,QAAQ,EAAEQ,YAAY,CAChE,CAAC;IACH,CAAC;IACD;IACAzD,QAAQ,EAAE,MAAAA,CAAO;MAAEiD,QAAQ;MAAEJ;IAAO,CAAC,KAAK;MACxC,MAAMY,YAAY,GAAGZ,MAAM,IAAIpD,IAAI,EAAE2C,EAAE;MACvC,IAAI,CAACqB,YAAY,EAAE;;MAEnB;MACA,MAAM/D,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY;MAAE,CAAC,CAAC;MACvF,MAAM/D,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe;MAAE,CAAC,CAAC;;MAE1F;MACA,MAAMmE,uBAAuB,GAAGjE,WAAW,CAACY,YAAY,CAAC1B,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY,CAAC,CAAC;MAClG,MAAMpD,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;;MAEhG;MACA,IAAImE,uBAAuB,EAAE;QAC3BjE,WAAW,CAACe,YAAY,CAAkB7B,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY,CAAC,EAAE;UAClF,GAAIE,uBAA2C;UAC/C,GAAGV;QACL,CAAC,CAAC;MACJ;;MAEA;MACA,IAAI5C,YAAY,EAAE;QAChBX,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;UAC1E,GAAGa,YAAY;UACf2C,eAAe,EAAE;YACf,GAAG3C,YAAY,CAAC2C,eAAe;YAC/B,GAAGC;UACL;QACF,CAAC,CAAC;MACJ;MAEA,OAAO;QAAEU,uBAAuB;QAAEtD;MAAa,CAAC;IAClD,CAAC;IACD;IACA;IACA;IACA;IACAO,OAAO,EAAEA,CAACC,KAAK,EAAE;MAAEoC,QAAQ;MAAEJ;IAAO,CAAC,EAAE/B,OAAO,KAAK;MACjD,MAAM2C,YAAY,GAAGZ,MAAM,IAAIpD,IAAI,EAAE2C,EAAE;MACvC,MAAMrB,WAAW,GAAGkC,QAAQ,GAAIjC,MAAM,CAACC,IAAI,CAACgC,QAAQ,CAAC,GAAoC,EAAE;;MAE3F;MACA,IAAInC,OAAO,EAAE6C,uBAAuB,IAAIF,YAAY,IAAI1C,WAAW,CAAC6C,MAAM,GAAG,CAAC,EAAE;QAC9E,MAAMV,eAAe,GAAGpC,OAAO,CAAC6C,uBAAkD;QAClF,MAAMR,sBAAsB,GAAGpC,WAAW,CAACI,MAAM,CAA2B,CAACC,GAAG,EAAEC,GAAG,KAAK;UACvFD,GAAG,CAA6BC,GAAG,CAAW,GAAG6B,eAAe,CAAC7B,GAAG,CAAW;UAChF,OAAOD,GAAG;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QACN,MAAMyC,cAAc,GAAGnE,WAAW,CAACY,YAAY,CAAkB1B,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY,CAAC,CAAC;QAC1G,IAAII,cAAc,EAAE;UAClBnE,WAAW,CAACe,YAAY,CAAkB7B,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY,CAAC,EAAE;YAClF,GAAGI,cAAc;YACjB,GAAGV;UACL,CAAC,CAAC;QACJ;MACF;;MAEA;MACA,IAAIrC,OAAO,EAAET,YAAY,IAAIU,WAAW,CAAC6C,MAAM,GAAG,CAAC,EAAE;QACnD,MAAMV,eAAe,GAAIpC,OAAO,CAACT,YAAY,CAAC2C,eAAe,IAAI,CAAC,CAA6B;QAC/F,MAAMG,sBAAsB,GAAGpC,WAAW,CAACI,MAAM,CAA2B,CAACC,GAAG,EAAEC,GAAG,KAAK;UACvFD,GAAG,CAA6BC,GAAG,CAAW,GAAG6B,eAAe,CAAC7B,GAAG,CAAW;UAChF,OAAOD,GAAG;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QACN,MAAMhB,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACV4C,eAAe,EAAE;cACf,IAAI5C,OAAO,CAAC4C,eAAe,IAAI,CAAC,CAAC,CAAC;cAClC,GAAGG;YACL;UACF,CAAC,CAAC;QACJ;MACF;;MAEA;MACA;MACA;MACA;MACA,IAAIM,YAAY,EAAE;QAChB/D,WAAW,CAAC2D,iBAAiB,CAAC;UAAEnD,QAAQ,EAAEtB,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY;QAAE,CAAC,CAAC;MACvF;MAEAtE,KAAK,CAAC0B,KAAK,CAACA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,mCAAmC,CAAC;IAC3F,CAAC;IACD;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACAC,SAAS,EAAEA,CAACC,IAAI,EAAE;MAAEmB,MAAM;MAAEI;IAAS,CAAC,KAAK;MACzC,MAAMQ,YAAY,GAAGZ,MAAM,IAAIpD,IAAI,EAAE2C,EAAE;MACvC,IAAI,CAACqB,YAAY,EAAE;MAEnB,MAAMK,QAAQ,GAAIpC,IAAI,IAAI,CAAC,CAAqB;MAChD,MAAMqC,SAAS,GAAId,QAAQ,IAAI,CAAC,CAA8B;MAE9DvD,WAAW,CAACe,YAAY,CACtB7B,SAAS,CAAC8E,OAAO,CAACT,QAAQ,CAACQ,YAAY,CAAC,EACvCO,QAAQ,KAAM;QACb,IAAIA,QAAQ,IAAI,CAAC,CAAC,CAAC;QACnB,GAAGD,SAAS;QACZ,GAAGD,QAAQ,CAAE;MACf,CAAC,CACH,CAAC;MAED,MAAMlB,WAAW,GAAGlD,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MAC/F,IAAIoD,WAAW,EAAE;QACf,MAAMqB,WAAiB,GAAG;UACxB,GAAGrB,WAAW;UACdI,eAAe,EAAE;YACf,IAAIJ,WAAW,CAACI,eAAe,IAAI,CAAC,CAAC,CAAC;YACtC,GAAGe,SAAS;YACZ,GAAGD;UACL;QACF,CAAC;QACDpE,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEyE,WAAW,CAAC;QACxF5E,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACqC,WAAW,CAAC;MAC9C;MACA;MACA;MACA;MACA;IACF;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;;AAYA;;AAOA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gCAAgC,GAAGA,CAAA,KAAM;EACpD,MAAM;IAAE3E,WAAW;IAAEC;EAAgB,CAAC,GAAGN,MAAM,CAAC,CAAC;EACjD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAACuE,6BAA6B,CAAC;IACpErE,UAAU,EAAE,MAAOsE,WAA6C,IAAK;MACnE,OAAOzF,oBAAoB,CACzBY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAAC4E,6BAA6B,CAACC,WAAW,CAC7D,CAAC;IACH,CAAC;IACDpE,QAAQ,EAAE,MAAOoE,WAAW,IAAK;MAC/B,MAAM1E,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe;MAAE,CAAC,CAAC;MAC1F,MAAMa,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MAEhG,IAAIa,YAAY,EAAE;QAChBX,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;UAC1E,GAAGa,YAAY;UACfgE,uBAAuB,EAAE;YACvB,GAAGhE,YAAY,CAACgE,uBAAuB;YACvC,GAAGD;UACL;QACF,CAAC,CAAC;MACJ;MAEA,OAAO;QAAE/D;MAAa,CAAC;IACzB,CAAC;IACDO,OAAO,EAAEA,CAACC,KAAK,EAAEyD,YAAY,EAAExD,OAAO,KAAK;MACzC,IAAIA,OAAO,EAAET,YAAY,EAAE;QACzB,MAAMD,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACViE,uBAAuB,EAAEvD,OAAO,CAACT,YAAY,CAACgE;UAChD,CAAC,CAAC;QACJ;MACF;MACAlF,KAAK,CAAC0B,KAAK,CACTA,KAAK,YAAYU,KAAK,GAClBV,KAAK,CAACW,OAAO,GACb,2CACN,CAAC;IACH,CAAC;IACDC,SAAS,EAAGC,IAAI,IAAK;MACnBhC,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC3ErC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACF,IAAI,CAAC;MACrC7C,wBAAwB,CAACa,WAAW,CAAC;IACvC;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAM6E,wBAAwB,GAAGA,CAAA,KAAM;EAC5C,MAAM;IAAEhF,WAAW;IAAEC;EAAgB,CAAC,GAAGN,MAAM,CAAC,CAAC;EACjD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAAC4E,qBAAqB,CAAC;IAC5D1E,UAAU,EAAE,MAAOsE,WAAqC,IAAK;MAC3D,OAAOzF,oBAAoB,CACzBY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAACiF,qBAAqB,CAACJ,WAAW,CACrD,CAAC;IACH,CAAC;IACDpE,QAAQ,EAAE,MAAOoE,WAAW,IAAK;MAC/B,MAAM1E,WAAW,CAACO,aAAa,CAAC;QAAEC,QAAQ,EAAEtB,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe;MAAE,CAAC,CAAC;MAC1F,MAAMa,YAAY,GAAGX,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;MAEhG,IAAIa,YAAY,EAAE;QAChBX,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;UAC1E,GAAGa,YAAY;UACfoE,eAAe,EAAE;YACf,GAAGpE,YAAY,CAACoE,eAAe;YAC/B,GAAGL;UACL;QACF,CAAC,CAAC;MACJ;MAEA,OAAO;QAAE/D;MAAa,CAAC;IACzB,CAAC;IACDO,OAAO,EAAEA,CAACC,KAAK,EAAEyD,YAAY,EAAExD,OAAO,KAAK;MACzC,IAAIA,OAAO,EAAET,YAAY,EAAE;QACzB,MAAMD,OAAO,GAAGV,WAAW,CAACY,YAAY,CAAO1B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,CAAC;QAC3F,IAAIY,OAAO,EAAE;UACXV,WAAW,CAACe,YAAY,CAAO7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAE;YAC1E,GAAGY,OAAO;YACVqE,eAAe,EAAE3D,OAAO,CAACT,YAAY,CAACoE;UACxC,CAAC,CAAC;QACJ;MACF;MACAtF,KAAK,CAAC0B,KAAK,CAACA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,8BAA8B,CAAC;IACtF,CAAC;IACDC,SAAS,EAAGC,IAAI,IAAK;MACnBhC,WAAW,CAACe,YAAY,CAAC7B,SAAS,CAACuB,QAAQ,CAACC,OAAO,CAACZ,eAAe,CAAC,EAAEkC,IAAI,CAAC;MAC3ErC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACF,IAAI,CAAC;MACrC7C,wBAAwB,CAACa,WAAW,CAAC;IACvC;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMgF,qBAAqB,GAAGA,CAAA,KAAM;EACzC,MAAM;IAAEnF,WAAW;IAAEC;EAAgB,CAAC,GAAGN,MAAM,CAAC,CAAC;EACjD,MAAMQ,WAAW,GAAGhB,cAAc,CAAC,CAAC;EAEpC,OAAOD,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAAC0F,aAAa,CAACC,MAAM,CAAC;IACnD9E,UAAU,EAAE,MAAO+E,aAAqB,IAAK;MAC3C,OAAOlG,oBAAoB,CAAOY,WAAW,EAAEC,eAAe,EAAE,MAC9DD,WAAW,CAACuF,cAAc,CAACD,aAAa,CAC1C,CAAC;IACH,CAAC;IACDpD,SAAS,EAAEA,CAAA,KAAM;MACf3C,8BAA8B,CAACY,WAAW,CAAC;IAC7C,CAAC;IACDkB,OAAO,EAAGC,KAAK,IAAK;MAClB1B,KAAK,CAAC0B,KAAK,CACTA,KAAK,YAAYU,KAAK,GAAGV,KAAK,CAACW,OAAO,GAAG,gCAC3C,CAAC;IACH;EACF,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMuD,aAAa,GAAGA,CAAA,KAAM;EACjC,MAAM;IAAExF,WAAW;IAAEC;EAAgB,CAAC,GAAGN,MAAM,CAAC,CAAC;EAEjD,OAAOT,WAAW,CAAC;IACjBkB,WAAW,EAAE,CAAC,GAAGV,YAAY,CAACW,OAAO,CAACoF,UAAU,CAAC;IACjDlF,UAAU,EAAE,MAAAA,CAAO;MACjBkC,IAAI;MACJiD,UAAU;MACVC,QAAQ;MACRC;IAMF,CAAC,KAAK;MACJ,OAAOxG,oBAAoB,CACzBY,WAAW,EACXC,eAAe,EACf,MAAMD,WAAW,CAAC2C,WAAW,CAACF,IAAI,EAAEiD,UAAU,EAAEC,QAAQ,EAAEC,UAAU,CACtE,CAAC;IACH;EACF,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/ui/hooks/queries/queryKeys.js

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

package/lib/module/ui/hooks/queries/useAccountQueries.js

@@ -213,12 +213,11 @@ export const useUsersBySessions = (sessionIds, options) => {
 };
 
 /**
- * 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 => {
+export const useConnectedApps = options => {
   const {
     oxyServices,
     activeSessionId,
@@ -227,7 +226,7 @@ export const useAuthorizedApps = options => {
   return useQuery({
     queryKey: queryKeys.connectedApps.list(),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.listAuthorizedApps());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.listConnectedApps());
     },
     enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 30 * 1000,

package/lib/module/ui/hooks/queries/useAccountQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useQuery","useQueries","useQueryClient","authenticatedApiCall","queryKeys","mutationKeys","useOxy","useAuthStore","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","queryClient","query","accounts","current","data","userWriteMutationsInFlight","isMutating","mutationKey","account","updateProfile","uploadAvatar","updateSettings","updatePrivacySettings","storedUser","getState","incomingUpdatedAt","parseUpdatedAt","updatedAt","storedUpdatedAt","setUser","value","Number","isFinite","Date","t","getTime","parse","useUserById","userId","detail","getUserById","useUserByUsername","username","details","getProfileByUsername","useUsersBySessions","list","length","useAuthorizedApps","connectedApps","listAuthorizedApps","usePrivacySettings","targetUserId","id","privacy","settings","getPrivacySettings"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,QAAQ,EAAEC,UAAU,EAAEC,cAAc,QAAQ,uBAAuB;AAC5E,SAASC,oBAAoB,QAAQ,aAAa;AAElD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SAASC,MAAM,QAAQ,6BAA0B;AACjD,SAASC,YAAY,QAAQ,2BAAwB;;AAErD;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAGA,CAACC,SAAwB,EAAEC,OAA+B,KAAK;EAC3F,MAAM;IAAEC;EAAY,CAAC,GAAGL,MAAM,CAAC,CAAC;EAEhC,OAAON,QAAQ,CAAC;IACdY,QAAQ,EAAER,SAAS,CAACS,KAAK,CAACC,OAAO,CAACL,SAAS,IAAI,EAAE,CAAC;IAClDM,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACN,SAAS,EAAE;QACd,MAAM,IAAIO,KAAK,CAAC,wBAAwB,CAAC;MAC3C;MACA,OAAO,MAAML,WAAW,CAACM,gBAAgB,CAACR,SAAS,CAAC;IACtD,CAAC;IACDS,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAK,CAAC,CAACT,SAAS;IACpDU,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAGA,CAACC,UAAoB,EAAEZ,OAA+B,KAAK;EACxF,MAAM;IAAEC;EAAY,CAAC,GAAGL,MAAM,CAAC,CAAC;EAEhC,OAAOL,UAAU,CAAC;IAChBsB,OAAO,EAAED,UAAU,CAACE,GAAG,CAAEf,SAAS,KAAM;MACtCG,QAAQ,EAAER,SAAS,CAACS,KAAK,CAACC,OAAO,CAACL,SAAS,CAAC;MAC5CM,OAAO,EAAE,MAAAA,CAAA,KAAY;QACnB,MAAMU,OAAO,GAAG,MAAMd,WAAW,CAACe,kBAAkB,CAAC,CAACjB,SAAS,CAAC,CAAC;QACjE,OAAOgB,OAAO,CAAC,CAAC,CAAC,EAAEE,IAAI,IAAI,IAAI;MACjC,CAAC;MACDT,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAK,CAAC,CAACT,SAAS;MACpDU,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;MACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;IACpB,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMQ,cAAc,GAAIlB,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEkB,eAAe;IAAEC;EAAgB,CAAC,GAAGxB,MAAM,CAAC,CAAC;EAClE,MAAMyB,WAAW,GAAG7B,cAAc,CAAC,CAAC;EAEpC,MAAM8B,KAAK,GAAGhC,QAAQ,CAAC;IACrBY,QAAQ,EAAER,SAAS,CAAC6B,QAAQ,CAACC,OAAO,CAACL,eAAe,CAAC;IACrDd,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACc,eAAe,EAAE;QACpB,MAAM,IAAIb,KAAK,CAAC,mBAAmB,CAAC;MACtC;MACA,OAAO,MAAML,WAAW,CAACM,gBAAgB,CAACY,eAAe,CAAC;IAC5D,CAAC;IACDX,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAKY,eAAe,IAAI,CAAC,CAACD,eAAe;IAC7EV,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;;EAEF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMe,IAAI,GAAGH,KAAK,CAACG,IAAI;EACvBpC,SAAS,CAAC,MAAM;IACd,IAAI,CAACoC,IAAI,EAAE;;IAEX;IACA;IACA;IACA,MAAMC,0BAA0B,GAC9BL,WAAW,CAACM,UAAU,CAAC;MAAEC,WAAW,EAAEjC,YAAY,CAACkC,OAAO,CAACC;IAAc,CAAC,CAAC,GAC3ET,WAAW,CAACM,UAAU,CAAC;MAAEC,WAAW,EAAEjC,YAAY,CAACkC,OAAO,CAACE;IAAa,CAAC,CAAC,GAC1EV,WAAW,CAACM,UAAU,CAAC;MAAEC,WAAW,EAAEjC,YAAY,CAACkC,OAAO,CAACG;IAAe,CAAC,CAAC,GAC5EX,WAAW,CAACM,UAAU,CAAC;MAAEC,WAAW,EAAEjC,YAAY,CAACkC,OAAO,CAACI;IAAsB,CAAC,CAAC;IAErF,IAAIP,0BAA0B,GAAG,CAAC,EAAE;MAClC;IACF;;IAEA;IACA;IACA;IACA;IACA,MAAMQ,UAAU,GAAGrC,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAAClB,IAAI;IAC/C,MAAMmB,iBAAiB,GAAGC,cAAc,CAACZ,IAAI,CAACa,SAAS,CAAC;IACxD,MAAMC,eAAe,GAAGF,cAAc,CAACH,UAAU,EAAEI,SAAS,CAAC;IAC7D,IACEF,iBAAiB,KAAK,IAAI,IAC1BG,eAAe,KAAK,IAAI,IACxBH,iBAAiB,GAAGG,eAAe,EACnC;MACA;IACF;IAEA1C,YAAY,CAACsC,QAAQ,CAAC,CAAC,CAACK,OAAO,CAACf,IAAI,CAAC;EACvC,CAAC,EAAE,CAACA,IAAI,EAAEJ,WAAW,CAAC,CAAC;EAEvB,OAAOC,KAAK;AACd,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,SAASe,cAAcA,CAACI,KAAc,EAAiB;EACrD,IAAIA,KAAK,IAAI,IAAI,EAAE,OAAO,IAAI;EAC9B,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE,OAAOC,MAAM,CAACC,QAAQ,CAACF,KAAK,CAAC,GAAGA,KAAK,GAAG,IAAI;EAC3E,IAAIA,KAAK,YAAYG,IAAI,EAAE;IACzB,MAAMC,CAAC,GAAGJ,KAAK,CAACK,OAAO,CAAC,CAAC;IACzB,OAAOJ,MAAM,CAACC,QAAQ,CAACE,CAAC,CAAC,GAAGA,CAAC,GAAG,IAAI;EACtC;EACA,IAAI,OAAOJ,KAAK,KAAK,QAAQ,EAAE;IAC7B,MAAMI,CAAC,GAAGD,IAAI,CAACG,KAAK,CAACN,KAAK,CAAC;IAC3B,OAAOC,MAAM,CAACC,QAAQ,CAACE,CAAC,CAAC,GAAGA,CAAC,GAAG,IAAI;EACtC;EACA,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA,OAAO,MAAMG,WAAW,GAAGA,CAACC,MAAqB,EAAEjD,OAA+B,KAAK;EACrF,MAAM;IAAEC;EAAY,CAAC,GAAGL,MAAM,CAAC,CAAC;EAEhC,OAAON,QAAQ,CAAC;IACdY,QAAQ,EAAER,SAAS,CAACS,KAAK,CAAC+C,MAAM,CAACD,MAAM,IAAI,EAAE,CAAC;IAC9C5C,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAAC4C,MAAM,EAAE;QACX,MAAM,IAAI3C,KAAK,CAAC,qBAAqB,CAAC;MACxC;MACA,OAAO,MAAML,WAAW,CAACkD,WAAW,CAACF,MAAM,CAAC;IAC9C,CAAC;IACDzC,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAK,CAAC,CAACyC,MAAM;IACjDxC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAM0C,iBAAiB,GAAGA,CAACC,QAAuB,EAAErD,OAA+B,KAAK;EAC7F,MAAM;IAAEC;EAAY,CAAC,GAAGL,MAAM,CAAC,CAAC;EAEhC,OAAON,QAAQ,CAAC;IACdY,QAAQ,EAAE,CAAC,GAAGR,SAAS,CAACS,KAAK,CAACmD,OAAO,CAAC,CAAC,EAAE,UAAU,EAAED,QAAQ,IAAI,EAAE,CAAC;IACpEhD,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACgD,QAAQ,EAAE;QACb,MAAM,IAAI/C,KAAK,CAAC,sBAAsB,CAAC;MACzC;MACA,OAAO,MAAML,WAAW,CAACsD,oBAAoB,CAACF,QAAQ,CAAC;IACzD,CAAC;IACD7C,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAK,CAAC,CAAC6C,QAAQ;IACnD5C,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAM8C,kBAAkB,GAAGA,CAAC5C,UAAoB,EAAEZ,OAA+B,KAAK;EAC3F,MAAM;IAAEC;EAAY,CAAC,GAAGL,MAAM,CAAC,CAAC;EAEhC,OAAON,QAAQ,CAAC;IACdY,QAAQ,EAAER,SAAS,CAAC6B,QAAQ,CAACkC,IAAI,CAAC7C,UAAU,CAAC;IAC7CP,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAIO,UAAU,CAAC8C,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,EAAE;MACX;MACA,OAAO,MAAMzD,WAAW,CAACe,kBAAkB,CAACJ,UAAU,CAAC;IACzD,CAAC;IACDJ,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAKI,UAAU,CAAC8C,MAAM,GAAG,CAAC;IAC9DjD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMiD,iBAAiB,GAAI3D,OAA+B,IAAK;EACpE,MAAM;IAAEC,WAAW;IAAEkB,eAAe;IAAEC;EAAgB,CAAC,GAAGxB,MAAM,CAAC,CAAC;EAElE,OAAON,QAAQ,CAAkB;IAC/BY,QAAQ,EAAER,SAAS,CAACkE,aAAa,CAACH,IAAI,CAAC,CAAC;IACxCpD,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOZ,oBAAoB,CACzBQ,WAAW,EACXkB,eAAe,EACf,MAAMlB,WAAW,CAAC4D,kBAAkB,CAAC,CACvC,CAAC;IACH,CAAC;IACDrD,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAKY,eAAe;IACxDX,SAAS,EAAE,EAAE,GAAG,IAAI;IAAE;IACtBC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG;EACnB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMoD,kBAAkB,GAAGA,CAACb,MAAe,EAAEjD,OAA+B,KAAK;EACtF,MAAM;IAAEC,WAAW;IAAEkB,eAAe;IAAEF;EAAK,CAAC,GAAGrB,MAAM,CAAC,CAAC;EACvD;EACA;EACA;EACA,MAAMmE,YAAY,GAAGd,MAAM,IAAIhC,IAAI,EAAE+C,EAAE;EAEvC,OAAO1E,QAAQ,CAAC;IACdY,QAAQ,EAAER,SAAS,CAACuE,OAAO,CAACC,QAAQ,CAACH,YAAY,CAAC;IAClD1D,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAAC0D,YAAY,EAAE;QACjB,MAAM,IAAIzD,KAAK,CAAC,qBAAqB,CAAC;MACxC;MAEA,OAAOb,oBAAoB,CACzBQ,WAAW,EACXkB,eAAe,EACf,MAAMlB,WAAW,CAACkE,kBAAkB,CAACJ,YAAY,CACnD,CAAC;IACH,CAAC;IACDvD,OAAO,EAAGR,OAAO,EAAEQ,OAAO,KAAK,KAAK,IAAK,CAAC,CAACuD,YAAY;IACvDtD,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useQuery","useQueries","useQueryClient","authenticatedApiCall","queryKeys","mutationKeys","useOxy","useAuthStore","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","queryClient","query","accounts","current","data","userWriteMutationsInFlight","isMutating","mutationKey","account","updateProfile","uploadAvatar","updateSettings","updatePrivacySettings","storedUser","getState","incomingUpdatedAt","parseUpdatedAt","updatedAt","storedUpdatedAt","setUser","value","Number","isFinite","Date","t","getTime","parse","useUserById","userId","detail","getUserById","useUserByUsername","username","details","getProfileByUsername","useUsersBySessions","list","length","useConnectedApps","connectedApps","listConnectedApps","usePrivacySettings","targetUserId","id","privacy","settings","getPrivacySettings"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useAuth.js

@@ -28,7 +28,6 @@
 import { useCallback } from 'react';
 import { useOxy } from "../context/OxyContext.js";
 import { isWebBrowser } from "../utils/isWebBrowser.js";
-import { showSignInModal } from "../components/SignInModal.js";
 /**
  * Unified auth hook for all Oxy apps
  *
@@ -57,43 +56,33 @@ export function useAuth() {
     hasIdentity,
     getPublicKey,
     showBottomSheet,
-    openAvatarPicker
+    openAvatarPicker,
+    openAccountDialog
   } = useOxy();
   const signIn = useCallback(async publicKey => {
-    // Web (no key): open the in-app "Sign in with Oxy" modal. There is NO
-    // automatic navigation to any login page — the device-first cold boot
-    // already restored a session if one existed; an explicit click presents the
-    // SDK sign-in surface (password / QR device flow / add account).
-    if (isWebBrowser() && !publicKey) {
-      showSignInModal();
-      // Resolves when the modal commits a session; the caller typically reacts
-      // to `isAuthenticated` rather than this promise.
-      return new Promise(() => undefined);
-    }
-
-    // Native: use the cryptographic identity directly when a public key is given.
+    // Native: sign in directly with the cryptographic identity when a public key
+    // is provided, or an existing keychain identity is found.
     if (publicKey) {
       return oxySignIn(publicKey);
     }
-
-    // Native with an existing keychain identity: sign in with it.
-    const hasExisting = await hasIdentity();
-    if (hasExisting) {
-      const existingKey = await getPublicKey();
-      if (existingKey) {
-        return oxySignIn(existingKey);
+    if (!isWebBrowser()) {
+      const hasExisting = await hasIdentity();
+      if (hasExisting) {
+        const existingKey = await getPublicKey();
+        if (existingKey) {
+          return oxySignIn(existingKey);
+        }
       }
     }
 
-    // Native with no identity: open the auth sheet (password / QR device flow).
-    if (showBottomSheet) {
-      showBottomSheet('OxyAuth');
-      return new Promise((_, reject) => {
-        reject(new Error('Please complete sign-in in the auth sheet'));
-      });
-    }
-    throw new Error('No authentication method available');
-  }, [oxySignIn, hasIdentity, getPublicKey, showBottomSheet]);
+    // Web, or native without a keychain identity: open the unified account dialog
+    // on its sign-in view (device flow / QR / password hand-off). There is NO
+    // automatic navigation to a login page — the device-first cold boot already
+    // restored a session if one existed. The caller reacts to `isAuthenticated`,
+    // so this promise intentionally never resolves.
+    openAccountDialog('signin');
+    return new Promise(() => undefined);
+  }, [oxySignIn, hasIdentity, getPublicKey, openAccountDialog]);
   const signOut = useCallback(async () => {
     await logout();
   }, [logout]);

package/lib/module/ui/hooks/useAuth.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useOxy","isWebBrowser","showSignInModal","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","publicKey","Promise","undefined","hasExisting","existingKey","_","reject","Error","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAkB,OAAO;AAC7C,SAASC,MAAM,QAAQ,0BAAuB;AAE9C,SAASC,YAAY,QAAQ,0BAAuB;AACpD,SAASC,eAAe,QAAQ,8BAA2B;AAkF3D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAAA,EAAkB;EACvC,MAAM;IACJC,IAAI;IACJC,eAAe;IACfC,SAAS;IACTC,YAAY;IACZC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IACLC,MAAM,EAAEC,SAAS;IACjBC,MAAM;IACNC,SAAS;IACTC,eAAe;IACfC,WAAW;IACXC,WAAW;IACXC,YAAY;IACZC,eAAe;IACfC;EACF,CAAC,GAAGtB,MAAM,CAAC,CAAC;EAEZ,MAAMa,MAAM,GAAGd,WAAW,CAAC,MAAOwB,SAAkB,IAAoB;IACtE;IACA;IACA;IACA;IACA,IAAItB,YAAY,CAAC,CAAC,IAAI,CAACsB,SAAS,EAAE;MAChCrB,eAAe,CAAC,CAAC;MACjB;MACA;MACA,OAAO,IAAIsB,OAAO,CAAO,MAAMC,SAAS,CAAC;IAC3C;;IAEA;IACA,IAAIF,SAAS,EAAE;MACb,OAAOT,SAAS,CAACS,SAAS,CAAC;IAC7B;;IAEA;IACA,MAAMG,WAAW,GAAG,MAAMP,WAAW,CAAC,CAAC;IACvC,IAAIO,WAAW,EAAE;MACf,MAAMC,WAAW,GAAG,MAAMP,YAAY,CAAC,CAAC;MACxC,IAAIO,WAAW,EAAE;QACf,OAAOb,SAAS,CAACa,WAAW,CAAC;MAC/B;IACF;;IAEA;IACA,IAAIN,eAAe,EAAE;MACnBA,eAAe,CAAC,SAAS,CAAC;MAC1B,OAAO,IAAIG,OAAO,CAAC,CAACI,CAAC,EAAEC,MAAM,KAAK;QAChCA,MAAM,CAAC,IAAIC,KAAK,CAAC,2CAA2C,CAAC,CAAC;MAChE,CAAC,CAAC;IACJ;IAEA,MAAM,IAAIA,KAAK,CAAC,oCAAoC,CAAC;EACvD,CAAC,EAAE,CAAChB,SAAS,EAAEK,WAAW,EAAEC,YAAY,EAAEC,eAAe,CAAC,CAAC;EAE3D,MAAMU,OAAO,GAAGhC,WAAW,CAAC,YAA2B;IACrD,MAAMgB,MAAM,CAAC,CAAC;EAChB,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMiB,UAAU,GAAGjC,WAAW,CAAC,YAA2B;IACxD,MAAMiB,SAAS,CAAC,CAAC;EACnB,CAAC,EAAE,CAACA,SAAS,CAAC,CAAC;EAEf,MAAMiB,OAAO,GAAGlC,WAAW,CAAC,YAA2B;IACrD,MAAMkB,eAAe,CAAC,CAAC;EACzB,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAErB,OAAO;IACL;IACAb,IAAI;IACJC,eAAe;IACfC,SAAS,EAAEA,SAAS,IAAI,CAACK,cAAc;IACvCuB,OAAO,EAAE3B,YAAY;IACrBC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IAEL;IACAC,MAAM;IACNkB,OAAO;IACPC,UAAU;IACVC,OAAO;IAEP;IACAf,WAAW;IACXG,eAAe;IACfC;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["useCallback","useOxy","isWebBrowser","useAuth","user","isAuthenticated","isLoading","isTokenReady","hasAccessToken","canUsePrivateApi","isPrivateApiPending","isAuthResolved","error","signIn","oxySignIn","logout","logoutAll","refreshSessions","oxyServices","hasIdentity","getPublicKey","showBottomSheet","openAvatarPicker","openAccountDialog","publicKey","hasExisting","existingKey","Promise","undefined","signOut","signOutAll","refresh","isReady"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAuth.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,MAAM,QAAQ,0BAAuB;AAE9C,SAASC,YAAY,QAAQ,0BAAuB;AAkFpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,OAAOA,CAAA,EAAkB;EACvC,MAAM;IACJC,IAAI;IACJC,eAAe;IACfC,SAAS;IACTC,YAAY;IACZC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IACLC,MAAM,EAAEC,SAAS;IACjBC,MAAM;IACNC,SAAS;IACTC,eAAe;IACfC,WAAW;IACXC,WAAW;IACXC,YAAY;IACZC,eAAe;IACfC,gBAAgB;IAChBC;EACF,CAAC,GAAGtB,MAAM,CAAC,CAAC;EAEZ,MAAMY,MAAM,GAAGb,WAAW,CAAC,MAAOwB,SAAkB,IAAoB;IACtE;IACA;IACA,IAAIA,SAAS,EAAE;MACb,OAAOV,SAAS,CAACU,SAAS,CAAC;IAC7B;IACA,IAAI,CAACtB,YAAY,CAAC,CAAC,EAAE;MACnB,MAAMuB,WAAW,GAAG,MAAMN,WAAW,CAAC,CAAC;MACvC,IAAIM,WAAW,EAAE;QACf,MAAMC,WAAW,GAAG,MAAMN,YAAY,CAAC,CAAC;QACxC,IAAIM,WAAW,EAAE;UACf,OAAOZ,SAAS,CAACY,WAAW,CAAC;QAC/B;MACF;IACF;;IAEA;IACA;IACA;IACA;IACA;IACAH,iBAAiB,CAAC,QAAQ,CAAC;IAC3B,OAAO,IAAII,OAAO,CAAO,MAAMC,SAAS,CAAC;EAC3C,CAAC,EAAE,CAACd,SAAS,EAAEK,WAAW,EAAEC,YAAY,EAAEG,iBAAiB,CAAC,CAAC;EAE7D,MAAMM,OAAO,GAAG7B,WAAW,CAAC,YAA2B;IACrD,MAAMe,MAAM,CAAC,CAAC;EAChB,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEZ,MAAMe,UAAU,GAAG9B,WAAW,CAAC,YAA2B;IACxD,MAAMgB,SAAS,CAAC,CAAC;EACnB,CAAC,EAAE,CAACA,SAAS,CAAC,CAAC;EAEf,MAAMe,OAAO,GAAG/B,WAAW,CAAC,YAA2B;IACrD,MAAMiB,eAAe,CAAC,CAAC;EACzB,CAAC,EAAE,CAACA,eAAe,CAAC,CAAC;EAErB,OAAO;IACL;IACAb,IAAI;IACJC,eAAe;IACfC,SAAS,EAAEA,SAAS,IAAI,CAACK,cAAc;IACvCqB,OAAO,EAAEzB,YAAY;IACrBC,cAAc;IACdC,gBAAgB;IAChBC,mBAAmB;IACnBC,cAAc;IACdC,KAAK;IAEL;IACAC,MAAM;IACNgB,OAAO;IACPC,UAAU;IACVC,OAAO;IAEP;IACAb,WAAW;IACXG,eAAe;IACfC;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/hooks/useSwitchableAccounts.js

@@ -1,283 +1,54 @@
 "use strict";
 
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { getAccountDisplayName, getAccountFallbackHandle } from '@oxyhq/core';
+import { useCallback, useMemo, useSyncExternalStore } from 'react';
 import { useOxy } from "../context/OxyContext.js";
-import { useI18n } from "./useI18n.js";
-import { queryKeys } from "./queries/queryKeys.js";
-
-/**
- * The per-account user shape carried by a {@link SwitchableAccount}. The SDK's
- * canonical {@link User} document — either the freshest `useOxy().user` (the
- * active row), a profile resolved via `oxyServices.getUsersByIds()` (every other
- * device row), or the `account` document embedded in an account-graph node.
- */
-
-/**
- * One account the signed-in user can switch INTO, in the uniform switch model.
- *
- * A switchable account is either a device sign-in, an account-graph node (owned
- * org / shared-with-you), or BOTH (an account that has been switched into
- * becomes a device session while still being a graph node — the two are deduped
- * into a single row). Every row carries a canonical `accountId` (the uniform
- * switch key passed to `switchToAccount`); `sessionId` is present IFF the
- * account is currently signed in on THIS device.
- */
-
-/** The minimal device-session shape {@link buildSwitchableAccounts} reads. */
-
 /**
- * Resolve which entries are the current account, robustly.
- *
- * Primary signal: `entry.sessionId === activeSessionId` — both are projected
- * from the same `SessionClient` state, so this normally matches exactly.
- * Fallbacks exist only to bridge the brief window between the two sequential
- * `updateSessions` / `setActiveSessionId` calls in `OxyContext.syncFromClient`,
- * applied only when the `sessionId` match found nothing AND the user is
- * authenticated:
- *  1. Match the live `user.id` against each entry's per-account user id.
- *  2. If still nothing and there is exactly one account, mark that one current.
- *
- * At most ONE entry is ever marked current. Runs over DEVICE rows only (graph
- * rows are never active — the active account is always a device session), so the
- * single-account fallback counts device rows.
- *
- * Pure & side-effect free so it is unit-testable without rendering React.
+ * Stable empty snapshot for the no-provider loading state, so `useSyncExternalStore`
+ * always has a getSnapshot that returns a constant reference before mount.
  */
-export function markCurrentAccount(accounts, activeSessionId, liveUserId, isAuthenticated) {
-  const bySession = accounts.map(account => ({
-    ...account,
-    isCurrent: Boolean(activeSessionId) && account.sessionId === activeSessionId
-  }));
-  if (bySession.some(account => account.isCurrent) || !isAuthenticated) {
-    return bySession;
-  }
-
-  // No row matched by session id: fall back to the live user's id, marking at
-  // most the FIRST matching entry current (never more than one).
-  if (liveUserId) {
-    let matched = false;
-    const byUser = bySession.map(account => {
-      if (!matched && account.user.id === liveUserId) {
-        matched = true;
-        return {
-          ...account,
-          isCurrent: true
-        };
-      }
-      return account;
-    });
-    if (matched) {
-      return byUser;
-    }
-  }
-
-  // Authenticated, nothing matched, but there is exactly one account → it must
-  // be the current one.
-  if (bySession.length === 1) {
-    return [{
-      ...bySession[0],
-      isCurrent: true
-    }];
+const EMPTY_SNAPSHOT = {
+  view: 'accounts',
+  accounts: [],
+  activeAccountId: null,
+  loading: false,
+  error: null,
+  switchingAccountId: null,
+  signIn: {
+    phase: 'idle',
+    authorizeCode: null,
+    qrPayload: null,
+    expiresAt: null,
+    error: null
   }
-  return bySession;
-}
+};
 
 /**
- * Pure union of device sign-ins and account-graph nodes into the flat
- * {@link SwitchableAccount}[] the switchers render. Extracted so the merge /
- * dedup semantics are unit-testable without rendering React.
- *
- * Order: device rows first (in session order, current flagged), then graph-only
- * rows (in graph order). An account present as BOTH a device session and a graph
- * node is deduped into ONE device row enriched with the graph metadata
- * (relationship / kind / parent / membership).
- */
-export function buildSwitchableAccounts(input) {
-  const {
-    sessions,
-    activeSessionId,
-    liveUser,
-    isAuthenticated,
-    graph,
-    profilesById,
-    locale,
-    resolveAvatarUrl
-  } = input;
-
-  // Nothing is switchable when signed out — never surface a lingering device
-  // session or graph node once the user is unauthenticated.
-  if (!isAuthenticated) {
-    return [];
-  }
-  const toRow = (accountUser, opts) => {
-    const displayName = getAccountDisplayName(accountUser, locale);
-    const handle = getAccountFallbackHandle(accountUser);
-    const secondaryHandle = handle ? `@${handle}` : null;
-    return {
-      accountId: accountUser.id?.toString() ?? '',
-      sessionId: opts.sessionId,
-      authuser: opts.authuser,
-      isCurrent: Boolean(opts.sessionId) && opts.sessionId === activeSessionId,
-      onDevice: Boolean(opts.sessionId),
-      relationship: opts.relationship,
-      kind: opts.kind,
-      parentAccountId: opts.parentAccountId,
-      callerMembership: opts.callerMembership,
-      displayName,
-      // Real email, or the `@handle` fallback (NEVER synthesized).
-      email: accountUser.email ?? secondaryHandle,
-      avatarUrl: resolveAvatarUrl(accountUser.avatar),
-      color: accountUser.color ?? null,
-      user: accountUser
-    };
-  };
-
-  // --- Device rows ---
-  const built = sessions.flatMap(session => {
-    const isCurrent = session.sessionId === activeSessionId;
-    // The active row always uses the live `user` — freshest available —
-    // regardless of whether the batch profile fetch has resolved yet.
-    const accountUser = isCurrent && liveUser ? liveUser : session.userId ? profilesById.get(session.userId) : undefined;
-    if (!accountUser) {
-      return [];
-    }
-    return [toRow(accountUser, {
-      sessionId: session.sessionId,
-      authuser: session.authuser
-    })];
-  });
-  const flagged = markCurrentAccount(built, activeSessionId, liveUser?.id ?? null, isAuthenticated);
-
-  // The signed-in user must ALWAYS be represented, even before the device
-  // session set has synced (e.g. immediately after cold boot). Synthesize a
-  // single current row from the live `useOxy().user` in that case.
-  const deviceRows = flagged.length === 0 && isAuthenticated && liveUser && activeSessionId ? [toRow(liveUser, {
-    sessionId: activeSessionId
-  })] : flagged;
-
-  // --- Merge graph nodes, deduping by account id ---
-  const byAccountId = new Map();
-  const order = [];
-  const remember = row => {
-    if (!row.accountId || byAccountId.has(row.accountId)) {
-      return;
-    }
-    byAccountId.set(row.accountId, row);
-    order.push(row.accountId);
-  };
-  for (const row of deviceRows) {
-    remember(row);
-  }
-  for (const node of graph) {
-    const existing = byAccountId.get(node.accountId);
-    if (existing) {
-      // On-device account that is ALSO in the graph: enrich the device row
-      // with graph metadata; keep its (freshest) profile + sessionId.
-      byAccountId.set(node.accountId, {
-        ...existing,
-        relationship: node.relationship,
-        kind: node.kind,
-        parentAccountId: node.parentAccountId,
-        callerMembership: node.callerMembership
-      });
-      continue;
-    }
-    // Graph-only account (owned org / shared, not yet a device session).
-    remember(toRow(node.account, {
-      relationship: node.relationship,
-      kind: node.kind,
-      parentAccountId: node.parentAccountId,
-      callerMembership: node.callerMembership
-    }));
-  }
-  return order.flatMap(id => {
-    const row = byAccountId.get(id);
-    return row ? [row] : [];
-  });
-}
-
-/**
- * Resolve every account the signed-in user can switch into — device sign-ins
- * AND linked graph accounts (owned orgs + shared-with-you) — as one flat list
- * with real per-account name / email / avatar / color, deduped by account id.
- *
- * ## Data sources
- *
- * - Device sign-ins: `useOxy().sessions` — a `ClientSession[]` projected by
- *   `OxyContext.syncFromClient` from the server-authoritative `SessionClient`.
- *   Each session carries only `sessionId` + `userId`, so this hook additionally
- *   fetches every device account's profile via `oxyServices.getUsersByIds()`.
- *   The ACTIVE row always uses `useOxy().user` directly (the freshest copy).
- * - Linked accounts: `useOxy().accounts` — the `AccountNode[]` graph the context
- *   loads from `GET /accounts`. Each node already embeds its `account` `User`
- *   document, so graph-only rows need no extra fetch.
- *
- * An account present as BOTH a device session and a graph node is deduped into
- * ONE row (see {@link buildSwitchableAccounts}). EVERY row switches the same
- * way — through `useOxy().switchToAccount(row.accountId)`.
- *
- * ## Error handling
- *
- * `getUsersByIds()` resolves to `[]` on a failed chunk (logged internally)
- * rather than throwing. Device accounts whose profile could not be resolved are
- * omitted until a subsequent fetch succeeds (except the active one, which never
- * depends on this fetch); graph accounts are unaffected.
+ * Every account the signed-in user can switch into — device sign-ins AND linked
+ * graph accounts (owned orgs + shared-with-you) — as one flat, deduped list with
+ * real per-account name / email / avatar / color.
+ *
+ * This is a thin binding over the shared `AccountDialogController` in
+ * `@oxyhq/core` (the SAME headless source the {@link OxyAccountDialog} renders),
+ * so there is ONE projection (`projectSwitchableAccounts`) and one switch path
+ * (`controller.switchTo`) across the whole SDK — the local duplicate projection
+ * this hook used to own has been removed. Every switch routes through
+ * `useOxy().switchToAccount(accountId)` (or the dialog's row press).
  */
 export function useSwitchableAccounts() {
   const {
-    oxyServices,
-    sessions,
-    activeSessionId,
-    user,
-    isAuthenticated,
-    accounts: graph
+    accountDialogController: controller
   } = useOxy();
-  const {
-    locale
-  } = useI18n();
-
-  // Every distinct account id carried by the device's session set, sorted for
-  // a stable query key regardless of session ordering.
-  const accountIds = useMemo(() => {
-    const ids = new Set();
-    for (const session of sessions ?? []) {
-      if (session.userId) {
-        ids.add(session.userId);
-      }
-    }
-    return Array.from(ids).sort();
-  }, [sessions]);
-  const profilesQuery = useQuery({
-    queryKey: queryKeys.users.list(accountIds),
-    queryFn: () => oxyServices.getUsersByIds(accountIds),
-    enabled: isAuthenticated && accountIds.length > 0,
-    staleTime: 5 * 60 * 1000,
-    // 5 minutes — matches useUserProfile's convention
-    gcTime: 30 * 60 * 1000 // 30 minutes
-  });
-  const profilesById = useMemo(() => {
-    const map = new Map();
-    for (const profile of profilesQuery.data ?? []) {
-      map.set(profile.id, profile);
-    }
-    return map;
-  }, [profilesQuery.data]);
-  const accounts = useMemo(() => buildSwitchableAccounts({
-    sessions: sessions ?? [],
-    activeSessionId: activeSessionId ?? null,
-    liveUser: user ?? null,
-    isAuthenticated,
-    graph: graph ?? [],
-    profilesById,
-    locale,
-    resolveAvatarUrl: avatar => avatar ? oxyServices.getFileDownloadUrl(avatar, 'thumb') : undefined
-  }), [sessions, activeSessionId, user, isAuthenticated, graph, profilesById, locale, oxyServices]);
+  const subscribe = useCallback(listener => controller ? controller.subscribe(listener) : () => undefined, [controller]);
+  const getSnapshot = useCallback(() => controller ? controller.getSnapshot() : EMPTY_SNAPSHOT, [controller]);
+  const snapshot = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+  const currentSessionId = useMemo(() => {
+    const active = snapshot.accounts.find(account => account.accountId === snapshot.activeAccountId);
+    return active?.sessionId ?? null;
+  }, [snapshot]);
   return {
-    accounts,
-    isLoading: isAuthenticated && accountIds.length > 0 && profilesQuery.isLoading,
-    currentSessionId: activeSessionId ?? null
+    accounts: snapshot.accounts,
+    isLoading: snapshot.loading,
+    currentSessionId
   };
 }
 //# sourceMappingURL=useSwitchableAccounts.js.map