@ovok/native 1.16.1-dev.2093 → 1.16.1-dev.2097

package/lib/module/modules/auth/hooks/use-session.js

@@ -1,52 +1,173 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
+import { addEventListener as addNetworkEventListener } from "@react-native-community/netinfo";
 import * as React from "react";
 import { AppState } from "react-native";
 import { subscribeSessionChanges } from "../session/events.js";
-import { getSessionStore } from "../session/session-store.js";
-/** Shares the signed-in profile and remote-session list between components using one client. */
-const useSession = ({
+import { logoutSession } from "../session/logout-session.js";
+import { getHttpStatus, toError } from "../session/session-errors.js";
+import { initialSnapshot, profileFor, signedOutSnapshot } from "../session/session-snapshot.js";
+export const useSession = ({
   sessions: fetchSessions = true,
   refreshOnForeground = true
 } = {}) => {
-  const client = useClient();
-  const store = React.useMemo(() => getSessionStore(client), [client]);
-  const snapshot = React.useSyncExternalStore(store.subscribe, () => store.snapshot, () => store.snapshot);
-  const refresh = React.useCallback(() => store.refresh(fetchSessions), [fetchSessions, store]);
+  const client = useOvok();
+  const [snapshot, setSnapshot] = React.useState(initialSnapshot);
+  const revision = React.useRef(0);
+  const accountOperation = React.useRef(false);
+  const refresh = React.useCallback(async () => {
+    const requestRevision = ++revision.current;
+    const requested = accountOperation.current;
+    try {
+      const [session, accounts] = await Promise.all([client.session.current(), client.session.savedAccounts.list()]);
+      if (requestRevision !== revision.current) {
+        return;
+      }
+      if (!session) {
+        setSnapshot(previous => signedOutSnapshot(accounts, previous, requested));
+        return;
+      }
+      const activeAccountId = accounts.find(account => account.active)?.id ?? session.profile.reference;
+      setSnapshot(previous => ({
+        ...previous,
+        status: previous.activeAccountId === activeAccountId && previous.profile ? previous.status : "loading",
+        activeAccountId,
+        accounts,
+        profile: previous.activeAccountId === activeAccountId ? previous.profile : undefined,
+        profileAccountId: previous.activeAccountId === activeAccountId ? previous.profileAccountId : undefined,
+        sessions: previous.activeAccountId === activeAccountId ? previous.sessions : [],
+        reason: undefined,
+        error: undefined
+      }));
+      const [profileResult, sessionsResult] = await Promise.all([profileFor(client, session.profile.reference).then(profile => ({
+        profile
+      }), error => ({
+        error
+      })), fetchSessions ? client.auth.sessions.list().then(sessions => ({
+        sessions
+      }), error => ({
+        error
+      })) : Promise.resolve({
+        sessions: undefined
+      })]);
+      if (requestRevision !== revision.current) {
+        return;
+      }
+      setSnapshot(previous => {
+        if (getHttpStatus("error" in profileResult ? profileResult.error : undefined) === 401) {
+          return signedOutSnapshot(accounts, previous, requested);
+        }
+        const profile = "profile" in profileResult ? profileResult.profile : previous.profileAccountId === activeAccountId ? previous.profile : undefined;
+        const error = "error" in profileResult ? profileResult.error : "error" in sessionsResult ? sessionsResult.error : undefined;
+        return {
+          ...previous,
+          status: "profile" in profileResult ? "authenticated" : "offline",
+          activeAccountId,
+          accounts,
+          profile,
+          profileAccountId: profile ? activeAccountId : undefined,
+          sessions: "sessions" in sessionsResult && sessionsResult.sessions ? sessionsResult.sessions : previous.sessions,
+          error: error === undefined ? undefined : toError(error)
+        };
+      });
+    } catch (error) {
+      if (requestRevision !== revision.current) {
+        return;
+      }
+      setSnapshot(previous => ({
+        ...previous,
+        status: previous.activeAccountId ? "offline" : "signed-out",
+        error: toError(error)
+      }));
+    }
+  }, [client, fetchSessions]);
+  const refreshSessions = React.useCallback(async () => {
+    const accountId = snapshot.activeAccountId;
+    if (!accountId) {
+      return;
+    }
+    try {
+      const sessions = await client.auth.sessions.list();
+      setSnapshot(previous => previous.activeAccountId === accountId ? {
+        ...previous,
+        sessions,
+        error: undefined
+      } : previous);
+    } catch (error) {
+      const failure = toError(error);
+      setSnapshot(previous => previous.activeAccountId === accountId ? {
+        ...previous,
+        error: failure
+      } : previous);
+      throw failure;
+    }
+  }, [client, snapshot.activeAccountId]);
+  const runAccountOperation = React.useCallback(async operation => {
+    accountOperation.current = true;
+    ++revision.current;
+    setSnapshot(previous => ({
+      ...previous,
+      switching: true
+    }));
+    try {
+      await operation();
+    } finally {
+      await refresh();
+      accountOperation.current = false;
+      setSnapshot(previous => ({
+        ...previous,
+        switching: false
+      }));
+    }
+  }, [refresh]);
   React.useEffect(() => {
+    setSnapshot(initialSnapshot);
     void refresh();
-    const subscription = refreshOnForeground ? AppState.addEventListener("change", nextState => {
-      if (nextState === "active") {
+    const unsubscribeClient = client.session.onChange(() => {
+      if (!accountOperation.current) {
+        void refresh();
+      }
+    });
+    const unsubscribeLocal = subscribeSessionChanges(() => void refresh());
+    const foreground = refreshOnForeground ? AppState.addEventListener("change", state => {
+      if (state === "active") {
         void refresh();
       }
     }) : undefined;
-    const unsubscribe = subscribeSessionChanges(() => void refresh());
+    const currentRevision = revision;
     return () => {
-      subscription?.remove();
-      unsubscribe();
+      ++currentRevision.current;
+      unsubscribeClient();
+      unsubscribeLocal();
+      foreground?.remove();
     };
-  }, [refresh, refreshOnForeground]);
-  const profileIsCurrent = snapshot.activeAccountId !== undefined && snapshot.profileAccountId === snapshot.activeAccountId;
+  }, [client, refresh, refreshOnForeground]);
+  React.useEffect(() => {
+    if (snapshot.status !== "offline") {
+      return;
+    }
+    const unsubscribe = addNetworkEventListener(state => {
+      if (state.isConnected && state.isInternetReachable !== false) {
+        void refresh();
+      }
+    });
+    return unsubscribe;
+  }, [refresh, snapshot.status]);
   return {
-    status: snapshot.status,
-    activeAccountId: snapshot.activeAccountId,
-    patientId: profileIsCurrent && snapshot.profile?.resourceType === "Patient" ? snapshot.profile.id : undefined,
-    reason: snapshot.reason,
+    ...snapshot,
+    patientId: snapshot.profileAccountId === snapshot.activeAccountId && snapshot.profile?.resourceType === "Patient" ? snapshot.profile.id : undefined,
     isAuthenticated: snapshot.status === "authenticated" || snapshot.status === "offline",
-    accounts: snapshot.accounts,
-    profile: profileIsCurrent ? snapshot.profile : undefined,
-    sessions: snapshot.sessions,
     loading: snapshot.status === "loading",
-    switching: snapshot.switching === true,
-    error: snapshot.error,
     refresh,
-    refreshSessions: store.refreshSessions,
-    switchAccount: store.switchAccount,
-    removeAccount: store.removeAccount,
-    logout: store.logout,
-    revokeSessions: store.revokeSessions
+    refreshSessions,
+    switchAccount: accountId => runAccountOperation(() => client.session.savedAccounts.switch(accountId)),
+    removeAccount: accountId => runAccountOperation(() => client.session.savedAccounts.remove(accountId)),
+    logout: () => runAccountOperation(() => logoutSession(client)),
+    revokeSessions: async option => {
+      await client.auth.sessions.revoke(option);
+      await refresh();
+    }
   };
 };
-export { useSession };
 //# sourceMappingURL=use-session.js.map

package/lib/module/modules/auth/hooks/use-session.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","React","AppState","subscribeSessionChanges","getSessionStore","useSession","sessions","fetchSessions","refreshOnForeground","client","store","useMemo","snapshot","useSyncExternalStore","subscribe","refresh","useCallback","useEffect","subscription","addEventListener","nextState","undefined","unsubscribe","remove","profileIsCurrent","activeAccountId","profileAccountId","status","patientId","profile","resourceType","id","reason","isAuthenticated","accounts","loading","switching","error","refreshSessions","switchAccount","removeAccount","logout","revokeSessions"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-session.ts"],"mappings":";;AAAA,SAASA,SAAS,QAA+B,YAAY;AAC7D,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,QAAQ,cAAc;AAEvC,SAASC,uBAAuB,QAAQ,sBAAmB;AAC3D,SAASC,eAAe,QAAQ,6BAA0B;AAkC1D;AACA,MAAMC,UAAU,GAAGA,CAAC;EAClBC,QAAQ,EAAEC,aAAa,GAAG,IAAI;EAC9BC,mBAAmB,GAAG;AACL,CAAC,GAAG,CAAC,CAAC,KAAuB;EAC9C,MAAMC,MAAM,GAAGT,SAAS,CAAC,CAAC;EAC1B,MAAMU,KAAK,GAAGT,KAAK,CAACU,OAAO,CAAC,MAAMP,eAAe,CAACK,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEpE,MAAMG,QAAQ,GAAGX,KAAK,CAACY,oBAAoB,CACzCH,KAAK,CAACI,SAAS,EACf,MAAMJ,KAAK,CAACE,QAAQ,EACpB,MAAMF,KAAK,CAACE,QACd,CAAC;EAED,MAAMG,OAAO,GAAGd,KAAK,CAACe,WAAW,CAC/B,MAAMN,KAAK,CAACK,OAAO,CAACR,aAAa,CAAC,EAClC,CAACA,aAAa,EAAEG,KAAK,CACvB,CAAC;EAEDT,KAAK,CAACgB,SAAS,CAAC,MAAM;IACpB,KAAKF,OAAO,CAAC,CAAC;IAEd,MAAMG,YAAY,GAAGV,mBAAmB,GACpCN,QAAQ,CAACiB,gBAAgB,CAAC,QAAQ,EAAGC,SAAS,IAAK;MACjD,IAAIA,SAAS,KAAK,QAAQ,EAAE;QAC1B,KAAKL,OAAO,CAAC,CAAC;MAChB;IACF,CAAC,CAAC,GACFM,SAAS;IAEb,MAAMC,WAAW,GAAGnB,uBAAuB,CAAC,MAAM,KAAKY,OAAO,CAAC,CAAC,CAAC;IAEjE,OAAO,MAAM;MACXG,YAAY,EAAEK,MAAM,CAAC,CAAC;MACtBD,WAAW,CAAC,CAAC;IACf,CAAC;EACH,CAAC,EAAE,CAACP,OAAO,EAAEP,mBAAmB,CAAC,CAAC;EAElC,MAAMgB,gBAAgB,GACpBZ,QAAQ,CAACa,eAAe,KAAKJ,SAAS,IACtCT,QAAQ,CAACc,gBAAgB,KAAKd,QAAQ,CAACa,eAAe;EAExD,OAAO;IACLE,MAAM,EAAEf,QAAQ,CAACe,MAAM;IACvBF,eAAe,EAAEb,QAAQ,CAACa,eAAe;IACzCG,SAAS,EACPJ,gBAAgB,IAAIZ,QAAQ,CAACiB,OAAO,EAAEC,YAAY,KAAK,SAAS,GAC5DlB,QAAQ,CAACiB,OAAO,CAACE,EAAE,GACnBV,SAAS;IACfW,MAAM,EAAEpB,QAAQ,CAACoB,MAAM;IACvBC,eAAe,EACbrB,QAAQ,CAACe,MAAM,KAAK,eAAe,IAAIf,QAAQ,CAACe,MAAM,KAAK,SAAS;IACtEO,QAAQ,EAAEtB,QAAQ,CAACsB,QAAQ;IAC3BL,OAAO,EAAEL,gBAAgB,GACnBZ,QAAQ,CAACiB,OAAO,GAChBR,SAAS;IACff,QAAQ,EAAEM,QAAQ,CAACN,QAAQ;IAC3B6B,OAAO,EAAEvB,QAAQ,CAACe,MAAM,KAAK,SAAS;IACtCS,SAAS,EAAExB,QAAQ,CAACwB,SAAS,KAAK,IAAI;IACtCC,KAAK,EAAEzB,QAAQ,CAACyB,KAAK;IACrBtB,OAAO;IACPuB,eAAe,EAAE5B,KAAK,CAAC4B,eAAe;IACtCC,aAAa,EAAE7B,KAAK,CAAC6B,aAAa;IAClCC,aAAa,EAAE9B,KAAK,CAAC8B,aAAa;IAClCC,MAAM,EAAE/B,KAAK,CAAC+B,MAAM;IACpBC,cAAc,EAAEhC,KAAK,CAACgC;EACxB,CAAC;AACH,CAAC;AAED,SAA8CrC,UAAU","ignoreList":[]}
+{"version":3,"names":["useOvok","addEventListener","addNetworkEventListener","React","AppState","subscribeSessionChanges","logoutSession","getHttpStatus","toError","initialSnapshot","profileFor","signedOutSnapshot","useSession","sessions","fetchSessions","refreshOnForeground","client","snapshot","setSnapshot","useState","revision","useRef","accountOperation","refresh","useCallback","requestRevision","current","requested","session","accounts","Promise","all","savedAccounts","list","previous","activeAccountId","find","account","active","id","profile","reference","status","undefined","profileAccountId","reason","error","profileResult","sessionsResult","then","auth","resolve","refreshSessions","accountId","failure","runAccountOperation","operation","switching","useEffect","unsubscribeClient","onChange","unsubscribeLocal","foreground","state","currentRevision","remove","unsubscribe","isConnected","isInternetReachable","patientId","resourceType","isAuthenticated","loading","switchAccount","switch","removeAccount","logout","revokeSessions","option","revoke"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-session.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/auth/hooks/use-sign-in.js

@@ -1,11 +1,10 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import * as React from "react";
-import { saveLogin } from "../session/save-login.js";
 import { useAuthAction } from "./use-auth-action.js";
 const useSignIn = options => {
-  const client = useClient();
+  const client = useOvok();
   const optionsRef = React.useRef(options);
   optionsRef.current = options;
   const signIn = useAuthAction(async ({
@@ -13,30 +12,13 @@ const useSignIn = options => {
     password
   }) => {
     const current = optionsRef.current;
-    const loginResponse = await client.login(current.type === "Practitioner" ? {
+    return client.auth.login({
       email,
       password,
-      type: "Practitioner",
-      ...(current.tenantCode === undefined ? {} : {
-        tenantCode: current.tenantCode
-      })
-    } : {
-      email,
-      password,
-      type: current.type,
-      tenantCode: current.tenantCode
+      profileType: current.type
     });
-    if ("verify" in loginResponse) {
-      return loginResponse;
-    }
-    await saveLogin(client, loginResponse);
-    return loginResponse;
-  });
-  const verifyMfa = useAuthAction(async (step, code) => {
-    const response = await step.verify(code.trim());
-    await saveLogin(client, response);
-    return response;
   });
+  const verifyMfa = useAuthAction((challenge, code) => client.auth.verifyMfa(challenge, code.trim()));
   return {
     ...signIn,
     verifyMfa: verifyMfa.run,

package/lib/module/modules/auth/hooks/use-sign-in.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","React","saveLogin","useAuthAction","useSignIn","options","client","optionsRef","useRef","current","signIn","email","password","loginResponse","login","type","tenantCode","undefined","verifyMfa","step","code","response","verify","trim","run","mfaStatus","status","mfaLoading","loading","mfaError","error"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-sign-in.ts"],"mappings":";;AAAA,SAAwBA,SAAS,QAAQ,YAAY;AACrD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,SAAS,QAAQ,0BAAuB;AAEjD,SAASC,aAAa,QAAQ,sBAAmB;AAajD,MAAMC,SAAS,GAAIC,OAAsB,IAAK;EAC5C,MAAMC,MAAM,GAAGN,SAAS,CAAC,CAAC;EAC1B,MAAMO,UAAU,GAAGN,KAAK,CAACO,MAAM,CAACH,OAAO,CAAC;EAExCE,UAAU,CAACE,OAAO,GAAGJ,OAAO;EAE5B,MAAMK,MAAM,GAAGP,aAAa,CAAC,OAAO;IAAEQ,KAAK;IAAEC;EAA4B,CAAC,KAAK;IAC7E,MAAMH,OAAO,GAAGF,UAAU,CAACE,OAAO;IAElC,MAAMI,aAAa,GAAG,MAAMP,MAAM,CAACQ,KAAK,CAACL,OAAO,CAACM,IAAI,KAAK,cAAc,GACpE;MACEJ,KAAK;MACLC,QAAQ;MACRG,IAAI,EAAE,cAAc;MACpB,IAAIN,OAAO,CAACO,UAAU,KAAKC,SAAS,GAAG,CAAC,CAAC,GAAG;QAAED,UAAU,EAAEP,OAAO,CAACO;MAAW,CAAC;IAChF,CAAC,GACD;MAAEL,KAAK;MAAEC,QAAQ;MAAEG,IAAI,EAAEN,OAAO,CAACM,IAAI;MAAEC,UAAU,EAAEP,OAAO,CAACO;IAAW,CAAC,CAAC;IAE5E,IAAI,QAAQ,IAAIH,aAAa,EAAE;MAC7B,OAAOA,aAAa;IACtB;IAEA,MAAMX,SAAS,CAACI,MAAM,EAAEO,aAAa,CAAC;IAEtC,OAAOA,aAAa;EACtB,CAAC,CAAC;EAEF,MAAMK,SAAS,GAAGf,aAAa,CAAC,OAAOgB,IAAa,EAAEC,IAAY,KAAK;IACrE,MAAMC,QAAQ,GAAG,MAAMF,IAAI,CAACG,MAAM,CAACF,IAAI,CAACG,IAAI,CAAC,CAAC,CAAC;IAE/C,MAAMrB,SAAS,CAACI,MAAM,EAAEe,QAAQ,CAAC;IAEjC,OAAOA,QAAQ;EACjB,CAAC,CAAC;EAEF,OAAO;IACL,GAAGX,MAAM;IACTQ,SAAS,EAAEA,SAAS,CAACM,GAAG;IACxBC,SAAS,EAAEP,SAAS,CAACQ,MAAM;IAC3BC,UAAU,EAAET,SAAS,CAACU,OAAO;IAC7BC,QAAQ,EAAEX,SAAS,CAACY;EACtB,CAAC;AACH,CAAC;AAED,SAA2C1B,SAAS","ignoreList":[]}
+{"version":3,"names":["useOvok","React","useAuthAction","useSignIn","options","client","optionsRef","useRef","current","signIn","email","password","auth","login","profileType","type","verifyMfa","challenge","code","trim","run","mfaStatus","status","mfaLoading","loading","mfaError","error"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-sign-in.ts"],"mappings":";;AACA,SAASA,OAAO,QAAQ,uBAAuB;AAC/C,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,aAAa,QAAQ,sBAAmB;AAWjD,MAAMC,SAAS,GAAIC,OAAsB,IAAK;EAC5C,MAAMC,MAAM,GAAGL,OAAO,CAAC,CAAC;EACxB,MAAMM,UAAU,GAAGL,KAAK,CAACM,MAAM,CAACH,OAAO,CAAC;EAExCE,UAAU,CAACE,OAAO,GAAGJ,OAAO;EAE5B,MAAMK,MAAM,GAAGP,aAAa,CAAC,OAAO;IAAEQ,KAAK;IAAEC;EAA4B,CAAC,KAAK;IAC7E,MAAMH,OAAO,GAAGF,UAAU,CAACE,OAAO;IAElC,OAAOH,MAAM,CAACO,IAAI,CAACC,KAAK,CAAC;MACvBH,KAAK;MACLC,QAAQ;MACRG,WAAW,EAAEN,OAAO,CAACO;IACvB,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMC,SAAS,GAAGd,aAAa,CAAC,CAACe,SAAuB,EAAEC,IAAY,KACpEb,MAAM,CAACO,IAAI,CAACI,SAAS,CAACC,SAAS,EAAEC,IAAI,CAACC,IAAI,CAAC,CAAC,CAC9C,CAAC;EAED,OAAO;IACL,GAAGV,MAAM;IACTO,SAAS,EAAEA,SAAS,CAACI,GAAG;IACxBC,SAAS,EAAEL,SAAS,CAACM,MAAM;IAC3BC,UAAU,EAAEP,SAAS,CAACQ,OAAO;IAC7BC,QAAQ,EAAET,SAAS,CAACU;EACtB,CAAC;AACH,CAAC;AAED,SAA2CvB,SAAS","ignoreList":[]}

package/lib/module/modules/auth/hooks/use-sign-out.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { logoutSession } from "../session/logout-session.js";
 import { useAuthAction } from "./use-auth-action.js";
 export const useSignOut = () => {
-  const client = useClient();
+  const client = useOvok();
   return useAuthAction(() => logoutSession(client));
 };
 //# sourceMappingURL=use-sign-out.js.map

package/lib/module/modules/auth/hooks/use-sign-out.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","logoutSession","useAuthAction","useSignOut","client"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-sign-out.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,YAAY;AAEtC,SAASC,aAAa,QAAQ,8BAA2B;AAEzD,SAASC,aAAa,QAAQ,sBAAmB;AAEjD,OAAO,MAAMC,UAAU,GAAGA,CAAA,KAAM;EAC9B,MAAMC,MAAM,GAAGJ,SAAS,CAAC,CAAC;EAE1B,OAAOE,aAAa,CAAC,MACnBD,aAAa,CAACG,MAAyD,CACzE,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useOvok","logoutSession","useAuthAction","useSignOut","client"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-sign-out.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,uBAAuB;AAE/C,SAASC,aAAa,QAAQ,8BAA2B;AAEzD,SAASC,aAAa,QAAQ,sBAAmB;AAEjD,OAAO,MAAMC,UAAU,GAAGA,CAAA,KAAM;EAC9B,MAAMC,MAAM,GAAGJ,OAAO,CAAC,CAAC;EAExB,OAAOE,aAAa,CAAC,MAAMD,aAAa,CAACG,MAAM,CAAC,CAAC;AACnD,CAAC","ignoreList":[]}

package/lib/module/modules/auth/hooks/use-social-sign-in.js

@@ -1,13 +1,12 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { GoogleSignin, isCancelledResponse, isSuccessResponse } from "@react-native-google-signin/google-signin";
 import * as AppleAuthentication from "expo-apple-authentication";
 import * as React from "react";
-import { saveLogin } from "../session/save-login.js";
 import { useAuthAction } from "./use-auth-action.js";
 export const useSocialSignIn = options => {
-  const client = useClient();
+  const client = useOvok();
   const optionsRef = React.useRef(options);
   optionsRef.current = options;
   return useAuthAction(async () => {
@@ -33,12 +32,10 @@ export const useSocialSignIn = options => {
       if (!idToken) {
         throw new Error("No ID token received from Google Sign-In");
       }
-      const loginResponse = await client.googleLogin({
+      return client.auth.socialLogin("google", {
         idToken,
         internalId: current.internalId
       });
-      await saveLogin(client, loginResponse);
-      return loginResponse;
     }
     let credentials;
     try {
@@ -55,15 +52,13 @@ export const useSocialSignIn = options => {
     if (!credentials.identityToken || !credentials.authorizationCode) {
       throw new Error("Missing required Apple sign-in credentials");
     }
-    const loginResponse = await client.appleLogin({
+    return client.auth.socialLogin("apple", {
       ...credentials,
       identityToken: credentials.identityToken,
       authorizationCode: credentials.authorizationCode,
       email: credentials.email ?? "",
       internalId: current.internalId
     });
-    await saveLogin(client, loginResponse);
-    return loginResponse;
   });
 };
 //# sourceMappingURL=use-social-sign-in.js.map

package/lib/module/modules/auth/hooks/use-social-sign-in.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","GoogleSignin","isCancelledResponse","isSuccessResponse","AppleAuthentication","React","saveLogin","useAuthAction","useSocialSignIn","options","client","optionsRef","useRef","current","provider","configure","iosClientId","googleIosClientId","webClientId","googleWebClientId","hasPlayServices","Error","response","signIn","idToken","getTokens","loginResponse","googleLogin","internalId","credentials","signInAsync","requestedScopes","AppleAuthenticationScope","FULL_NAME","EMAIL","error","code","identityToken","authorizationCode","appleLogin","email"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-social-sign-in.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","GoogleSignin","isCancelledResponse","isSuccessResponse","AppleAuthentication","React","useAuthAction","useSocialSignIn","options","client","optionsRef","useRef","current","provider","configure","iosClientId","googleIosClientId","webClientId","googleWebClientId","hasPlayServices","Error","response","signIn","idToken","getTokens","auth","socialLogin","internalId","credentials","signInAsync","requestedScopes","AppleAuthenticationScope","FULL_NAME","EMAIL","error","code","identityToken","authorizationCode","email"],"sourceRoot":"../../../../../src","sources":["modules/auth/hooks/use-social-sign-in.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,uBAAuB;AAC/C,SACEC,YAAY,EAEZC,mBAAmB,EACnBC,iBAAiB,QACZ,2CAA2C;AAClD,OAAO,KAAKC,mBAAmB,MAAM,2BAA2B;AAChE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,SAASC,aAAa,QAAQ,sBAAmB;AAWjD,OAAO,MAAMC,eAAe,GAAIC,OAA4B,IAAK;EAC/D,MAAMC,MAAM,GAAGT,OAAO,CAAC,CAAC;EACxB,MAAMU,UAAU,GAAGL,KAAK,CAACM,MAAM,CAACH,OAAO,CAAC;EAExCE,UAAU,CAACE,OAAO,GAAGJ,OAAO;EAE5B,OAAOF,aAAa,CAAC,YAAY;IAC/B,MAAMM,OAAO,GAAGF,UAAU,CAACE,OAAO;IAElC,IAAIA,OAAO,CAACC,QAAQ,KAAK,QAAQ,EAAE;MACjCZ,YAAY,CAACa,SAAS,CAAC;QACrBC,WAAW,EAAEH,OAAO,CAACI,iBAAiB;QACtCC,WAAW,EAAEL,OAAO,CAACM;MACvB,CAAC,CAAC;MAEF,IAAI,EAAE,MAAMjB,YAAY,CAACkB,eAAe,CAAC,CAAC,CAAC,EAAE;QAC3C,MAAM,IAAIC,KAAK,CAAC,wCAAwC,CAAC;MAC3D;MAEA,MAAMC,QAAQ,GAAG,MAAMpB,YAAY,CAACqB,MAAM,CAAC,CAAC;MAE5C,IAAI,CAACnB,iBAAiB,CAACkB,QAAQ,CAAC,EAAE;QAChC,IAAInB,mBAAmB,CAACmB,QAA0B,CAAC,EAAE;UACnD,MAAM,IAAID,KAAK,CAAC,8BAA8B,CAAC;QACjD;QAEA,MAAM,IAAIA,KAAK,CAAC,2CAA2C,CAAC;MAC9D;MAEA,MAAM;QAAEG;MAAQ,CAAC,GAAG,MAAMtB,YAAY,CAACuB,SAAS,CAAC,CAAC;MAElD,IAAI,CAACD,OAAO,EAAE;QACZ,MAAM,IAAIH,KAAK,CAAC,0CAA0C,CAAC;MAC7D;MAEA,OAAOX,MAAM,CAACgB,IAAI,CAACC,WAAW,CAAC,QAAQ,EAAE;QACvCH,OAAO;QACPI,UAAU,EAAEf,OAAO,CAACe;MACtB,CAAC,CAAC;IACJ;IAEA,IAAIC,WAA8D;IAElE,IAAI;MACFA,WAAW,GAAG,MAAMxB,mBAAmB,CAACyB,WAAW,CAAC;QAClDC,eAAe,EAAE,CACf1B,mBAAmB,CAAC2B,wBAAwB,CAACC,SAAS,EACtD5B,mBAAmB,CAAC2B,wBAAwB,CAACE,KAAK;MAEtD,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOC,KAAK,EAAE;MACd,MAAMC,IAAI,GAAID,KAAK,CAA+BC,IAAI;MAEtD,IAAIA,IAAI,KAAK,sBAAsB,IAAIA,IAAI,KAAK,qBAAqB,EAAE;QACrE,MAAM,IAAIf,KAAK,CAAC,6BAA6B,CAAC;MAChD;MAEA,MAAMc,KAAK;IACb;IAEA,IAAI,CAACN,WAAW,CAACQ,aAAa,IAAI,CAACR,WAAW,CAACS,iBAAiB,EAAE;MAChE,MAAM,IAAIjB,KAAK,CAAC,4CAA4C,CAAC;IAC/D;IAEA,OAAOX,MAAM,CAACgB,IAAI,CAACC,WAAW,CAAC,OAAO,EAAE;MACtC,GAAGE,WAAW;MACdQ,aAAa,EAAER,WAAW,CAACQ,aAAa;MACxCC,iBAAiB,EAAET,WAAW,CAACS,iBAAiB;MAChDC,KAAK,EAAEV,WAAW,CAACU,KAAK,IAAI,EAAE;MAC9BX,UAAU,EAAEf,OAAO,CAACe;IACtB,CAAC,CAAC;EAEJ,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/modules/auth/profile/components/profile-form-provider.js

@@ -1,11 +1,12 @@
 "use strict";
 
-import { useClient, getPatchOperationType } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { useFormik } from "formik";
 import { parsePhoneNumberFromString } from "libphonenumber-js";
 import React from "react";
 import * as Yup from "yup";
 import { useShallowStableValue } from "../../../helpers/hooks/use-shallow-stable-value.js";
+import { notifySessionChanged } from "../../session/events.js";
 import { isNetworkError } from "../../utils/sign-in-error.js";
 import { ProfileFormContext } from "../contexts/profile-form-context.js";
 import { phoneCountryFieldName, toPhoneE164, isPhoneValidForCountry } from "../utils/phone.js";
@@ -17,7 +18,7 @@ export const ProfileFormProvider = ({
   onError,
   onSuccess
 }) => {
-  const client = useClient();
+  const client = useOvok();
   const submitInProgress = React.useRef(false);
   const initialValues = React.useMemo(() => {
     const values = fields.reduce((acc, field) => {
@@ -72,15 +73,19 @@ export const ProfileFormProvider = ({
         }
         let savedPatient;
         try {
-          const activeProfile = (await client.refetchProfile()) ?? (await client.getProfileAsync());
-          const patient = activeProfile;
+          const reference = (await client.session.current())?.profile.reference;
+          if (!reference?.startsWith("Patient/")) {
+            throw new Error("A signed-in patient is required to update the profile.");
+          }
+          const patientId = reference.slice("Patient/".length);
+          const patient = await client.fhir.read("Patient", patientId);
           const operations = fields.flatMap(field => {
             const value = values[field.name];
             if (field.toPatch) {
               return field.toPatch(value ?? "", patient);
             }
             const initialValue = initialValues[field.name];
-            const op = getPatchOperationType(initialValue, value);
+            const op = patchOperationFor(initialValue, value);
             if (!op) {
               return [];
             }
@@ -94,8 +99,8 @@ export const ProfileFormProvider = ({
               value
             }];
           });
-          savedPatient = await client.patchResource("Patient", activeProfile?.id ?? "", operations.filter(op => op.path !== "/submit"));
-          await client.refetchProfile();
+          savedPatient = await client.fhir.patch("Patient", patientId, operations.filter(op => op.path !== "/submit"));
+          notifySessionChanged();
         } catch (error) {
           formikHelpers.setFieldError("submit", isNetworkError(error) ? "profile.form.error.network" : "profile.form.error.generic");
           onError?.(error);
@@ -115,4 +120,13 @@ export const ProfileFormProvider = ({
     children: children
   });
 };
+const patchOperationFor = (previous, next) => {
+  if (previous === next) {
+    return undefined;
+  }
+  if (!next) {
+    return "remove";
+  }
+  return previous ? "replace" : "add";
+};
 //# sourceMappingURL=profile-form-provider.js.map

package/lib/module/modules/auth/profile/components/profile-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","getPatchOperationType","useFormik","parsePhoneNumberFromString","React","Yup","useShallowStableValue","isNetworkError","ProfileFormContext","phoneCountryFieldName","toPhoneE164","isPhoneValidForCountry","jsx","_jsx","ProfileFormProvider","children","fields","onSubmit","onError","onSuccess","client","submitInProgress","useRef","initialValues","useMemo","values","reduce","acc","field","value","type","defaultCountry","name","country","submit","validationSchema","fieldRules","validation","string","test","validatePhone","parent","object","shape","formik","enableReinitialize","validateOnBlur","formikHelpers","current","submittedValues","submitted","error","savedPatient","activeProfile","refetchProfile","getProfileAsync","patient","operations","flatMap","toPatch","initialValue","op","path","includes","split","filter","Boolean","join","patchResource","id","setFieldError","contextValue","Provider"],"sourceRoot":"../../../../../../src","sources":["modules/auth/profile/components/profile-form-provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","useFormik","parsePhoneNumberFromString","React","Yup","useShallowStableValue","notifySessionChanged","isNetworkError","ProfileFormContext","phoneCountryFieldName","toPhoneE164","isPhoneValidForCountry","jsx","_jsx","ProfileFormProvider","children","fields","onSubmit","onError","onSuccess","client","submitInProgress","useRef","initialValues","useMemo","values","reduce","acc","field","value","type","defaultCountry","name","country","submit","validationSchema","fieldRules","validation","string","test","validatePhone","parent","object","shape","formik","enableReinitialize","validateOnBlur","formikHelpers","current","submittedValues","submitted","error","savedPatient","reference","session","profile","startsWith","Error","patientId","slice","length","patient","fhir","read","operations","flatMap","toPatch","initialValue","op","patchOperationFor","path","includes","split","filter","Boolean","join","patch","setFieldError","contextValue","Provider","previous","next","undefined"],"sourceRoot":"../../../../../../src","sources":["modules/auth/profile/components/profile-form-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/auth/register/components/form/register-form-provider.js

@@ -1,15 +1,13 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { useFormik } from "formik";
 import React from "react";
 import { useShallowStableValue } from "../../../../helpers/hooks/use-shallow-stable-value.js";
-import { saveLogin } from "../../../session/save-login.js";
 import { applySubmitError } from "../../../utils/apply-submit-error.js";
 import { RegisterFormContext } from "../../contexts/register-form-context.js";
 import { createRegisterValidationSchema } from "../../utils/create-register-validation-schema.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-const isClinicianInviteStep = response => "nextStep" in response && response.nextStep === "clinician-invite";
 export const RegisterFormProvider = ({
   children,
   customValidations,
@@ -23,7 +21,7 @@ export const RegisterFormProvider = ({
   onError,
   onNextStep
 }) => {
-  const client = useClient();
+  const client = useOvok();
   const singleName = nameField === "single";
   const registerValidationSchema = React.useMemo(() => createRegisterValidationSchema({
     customValidations,
@@ -46,30 +44,31 @@ export const RegisterFormProvider = ({
     validationSchema: registerValidationSchema,
     onSubmit: async (values, formikHelpers) => {
       const mappedNames = singleName ? toRegisterNames?.(values.fullName ?? "") : undefined;
-      const registerValues = {
-        ...values
-      };
-      delete registerValues.fullName;
-      const updatedValues = {
-        ...registerValues,
-        ...(mappedNames ?? {}),
+      const registration = {
+        email: values.email,
+        password: values.password,
+        name: mappedNames?.name ?? values.name,
+        surname: mappedNames?.surname ?? values.surname,
         passwordConfirm: defaultValues?.passwordConfirm ? values.password : values.passwordConfirm,
-        tenantCode,
         ...(continueAsPatientToken !== undefined ? {
           continueAsPatientToken
         } : {})
       };
       if (onSubmit) {
-        return onSubmit(updatedValues, formikHelpers);
+        const customValues = {
+          ...registration,
+          tenantCode,
+          submit: values.submit
+        };
+        return onSubmit(customValues, formikHelpers);
       }
       try {
-        const registerResponse = await client.register(updatedValues);
-        if (isClinicianInviteStep(registerResponse)) {
+        const registerResponse = await client.auth.register(registration);
+        if (registerResponse.status === "clinician-invite") {
           onNextStep?.(registerResponse);
           return;
         }
-        await saveLogin(client, registerResponse);
-        onSuccess?.(registerResponse);
+        onSuccess?.(registerResponse.session);
       } catch (error) {
         applySubmitError(error, formikHelpers, {
           errorScope: "register",

package/lib/module/modules/auth/register/components/form/register-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","useFormik","React","useShallowStableValue","saveLogin","applySubmitError","RegisterFormContext","createRegisterValidationSchema","jsx","_jsx","isClinicianInviteStep","response","nextStep","RegisterFormProvider","children","customValidations","defaultValues","tenantCode","continueAsPatientToken","nameField","toRegisterNames","onSubmit","onSuccess","onError","onNextStep","client","singleName","registerValidationSchema","useMemo","disablePasswordConfirm","passwordConfirm","initialValues","email","password","name","surname","fullName","filter","Boolean","join","submit","formik","validateOnBlur","validationSchema","values","formikHelpers","mappedNames","undefined","registerValues","updatedValues","registerResponse","register","error","errorScope","isSignIn","mapFields","contextValue","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/register/components/form/register-form-provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","useFormik","React","useShallowStableValue","applySubmitError","RegisterFormContext","createRegisterValidationSchema","jsx","_jsx","RegisterFormProvider","children","customValidations","defaultValues","tenantCode","continueAsPatientToken","nameField","toRegisterNames","onSubmit","onSuccess","onError","onNextStep","client","singleName","registerValidationSchema","useMemo","disablePasswordConfirm","passwordConfirm","initialValues","email","password","name","surname","fullName","filter","Boolean","join","submit","formik","validateOnBlur","validationSchema","values","formikHelpers","mappedNames","undefined","registration","customValues","registerResponse","auth","register","status","session","error","errorScope","isSignIn","mapFields","contextValue","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/register/components/form/register-form-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/auth/reset-password/components/form/reset-password-form-provider.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import { useFormik } from "formik";
 import i18n from "i18next";
 import * as Yup from "yup";
@@ -16,7 +16,7 @@ export const ResetPasswordFormProvider = ({
   onSuccess,
   onError
 }) => {
-  const client = useClient();
+  const client = useOvok();
   const formik = useFormik({
     initialValues: {
       email: "",
@@ -32,7 +32,7 @@ export const ResetPasswordFormProvider = ({
         return onSubmit(values, helpers);
       }
       try {
-        await client.resetPassword(values);
+        await client.auth.resetPassword(values);
         const data = {
           message: i18n.t("reset-password.success")
         };