@ovok/native 1.16.1-dev.2095 → 1.16.1-dev.2099

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

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

@@ -1 +1 @@
-{"version":3,"names":["useClient","useFormik","i18n","Yup","useShallowStableValue","applySubmitError","emailSchema","ResetPasswordFormContext","jsx","_jsx","ResetPasswordFormProvider","children","type","onSubmit","onSuccess","onError","client","formik","initialValues","email","submit","validationSchema","object","string","oneOf","values","helpers","resetPassword","data","message","t","error","errorScope","isSignIn","contextValue","typeLocked","undefined","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/reset-password/components/form/reset-password-form-provider.tsx"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,YAAY;AACtC,SAASC,SAAS,QAAQ,QAAQ;AAClC,OAAOC,IAAI,MAAM,SAAS;AAC1B,OAAO,KAAKC,GAAG,MAAM,KAAK;AAE1B,SAASC,qBAAqB,QAAQ,uDAAoD;AAC1F,SAASC,gBAAgB,QAAQ,sCAAmC;AACpE,SAASC,WAAW,QAAQ,8BAA2B;AACvD,SAASC,wBAAwB,QAAQ,+CAA4C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAItF,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACxCC,QAAQ;EACRC,IAAI;EACJC,QAAQ;EACRC,SAAS;EACTC;AAC8B,CAAC,KAAK;EACpC,MAAMC,MAAM,GAAGhB,SAAS,CAAC,CAAC;EAE1B,MAAMiB,MAAM,GAAGhB,SAAS,CAA0B;IAChDiB,aAAa,EAAE;MACbC,KAAK,EAAE,EAAE;MACTP,IAAI,EAAEA,IAAI,IAAI,SAAS;MACvBQ,MAAM,EAAE;IACV,CAAC;IACDC,gBAAgB,EAAElB,GAAG,CAACmB,MAAM,CAAC;MAC3BH,KAAK,EAAEb,WAAW,CAAC,CAAC;MACpBM,IAAI,EAAET,GAAG,CAACoB,MAAM,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,eAAe,CAAC;IACvE,CAAC,CAAC;IACFX,QAAQ,EAAE,MAAAA,CAAOY,MAAM,EAAEC,OAAO,KAAK;MACnC,IAAIb,QAAQ,EAAE;QACZ,OAAOA,QAAQ,CAACY,MAAM,EAAEC,OAAO,CAAC;MAClC;MAEA,IAAI;QACF,MAAMV,MAAM,CAACW,aAAa,CAACF,MAAM,CAAC;QAElC,MAAMG,IAAI,GAAG;UACXC,OAAO,EAAE3B,IAAI,CAAC4B,CAAC,CAAC,wBAAwB;QAC1C,CAAC;QAEDhB,SAAS,GAAGc,IAAI,CAAC;MACnB,CAAC,CAAC,OAAOG,KAAK,EAAE;QACd1B,gBAAgB,CAAC0B,KAAK,EAAEL,OAAO,EAAE;UAC/BM,UAAU,EAAE,gBAAgB;UAC5BC,QAAQ,EAAE,KAAK;UACflB;QACF,CAAC,CAAC;MACJ;IACF;EACF,CAAC,CAAC;EAEF,MAAMmB,YAAY,GAAG9B,qBAAqB,CAAC;IACzC,GAAGa,MAAM;IACTkB,UAAU,EAAEvB,IAAI,KAAKwB;EACvB,CAAC,CAAC;EAEF,oBACE3B,IAAA,CAACF,wBAAwB,CAAC8B,QAAQ;IAACC,KAAK,EAAEJ,YAAa;IAAAvB,QAAA,EACpDA;EAAQ,CACwB,CAAC;AAExC,CAAC","ignoreList":[]}
+{"version":3,"names":["useOvok","useFormik","i18n","Yup","useShallowStableValue","applySubmitError","emailSchema","ResetPasswordFormContext","jsx","_jsx","ResetPasswordFormProvider","children","type","onSubmit","onSuccess","onError","client","formik","initialValues","email","submit","validationSchema","object","string","oneOf","values","helpers","auth","resetPassword","data","message","t","error","errorScope","isSignIn","contextValue","typeLocked","undefined","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/reset-password/components/form/reset-password-form-provider.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,uBAAuB;AAC/C,SAASC,SAAS,QAAQ,QAAQ;AAClC,OAAOC,IAAI,MAAM,SAAS;AAC1B,OAAO,KAAKC,GAAG,MAAM,KAAK;AAE1B,SAASC,qBAAqB,QAAQ,uDAAoD;AAC1F,SAASC,gBAAgB,QAAQ,sCAAmC;AACpE,SAASC,WAAW,QAAQ,8BAA2B;AACvD,SAASC,wBAAwB,QAAQ,+CAA4C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAItF,OAAO,MAAMC,yBAAyB,GAAGA,CAAC;EACxCC,QAAQ;EACRC,IAAI;EACJC,QAAQ;EACRC,SAAS;EACTC;AAC8B,CAAC,KAAK;EACpC,MAAMC,MAAM,GAAGhB,OAAO,CAAC,CAAC;EAExB,MAAMiB,MAAM,GAAGhB,SAAS,CAA0B;IAChDiB,aAAa,EAAE;MACbC,KAAK,EAAE,EAAE;MACTP,IAAI,EAAEA,IAAI,IAAI,SAAS;MACvBQ,MAAM,EAAE;IACV,CAAC;IACDC,gBAAgB,EAAElB,GAAG,CAACmB,MAAM,CAAC;MAC3BH,KAAK,EAAEb,WAAW,CAAC,CAAC;MACpBM,IAAI,EAAET,GAAG,CAACoB,MAAM,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,eAAe,CAAC;IACvE,CAAC,CAAC;IACFX,QAAQ,EAAE,MAAAA,CAAOY,MAAM,EAAEC,OAAO,KAAK;MACnC,IAAIb,QAAQ,EAAE;QACZ,OAAOA,QAAQ,CAACY,MAAM,EAAEC,OAAO,CAAC;MAClC;MAEA,IAAI;QACF,MAAMV,MAAM,CAACW,IAAI,CAACC,aAAa,CAACH,MAAM,CAAC;QAEvC,MAAMI,IAAI,GAAG;UACXC,OAAO,EAAE5B,IAAI,CAAC6B,CAAC,CAAC,wBAAwB;QAC1C,CAAC;QAEDjB,SAAS,GAAGe,IAAI,CAAC;MACnB,CAAC,CAAC,OAAOG,KAAK,EAAE;QACd3B,gBAAgB,CAAC2B,KAAK,EAAEN,OAAO,EAAE;UAC/BO,UAAU,EAAE,gBAAgB;UAC5BC,QAAQ,EAAE,KAAK;UACfnB;QACF,CAAC,CAAC;MACJ;IACF;EACF,CAAC,CAAC;EAEF,MAAMoB,YAAY,GAAG/B,qBAAqB,CAAC;IACzC,GAAGa,MAAM;IACTmB,UAAU,EAAExB,IAAI,KAAKyB;EACvB,CAAC,CAAC;EAEF,oBACE5B,IAAA,CAACF,wBAAwB,CAAC+B,QAAQ;IAACC,KAAK,EAAEJ,YAAa;IAAAxB,QAAA,EACpDA;EAAQ,CACwB,CAAC;AAExC,CAAC","ignoreList":[]}

package/lib/module/modules/auth/session/logout-session.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import { signOutGoogleIfNeeded } from "../utils/sign-out-google.js";
-import { notifySessionChanged } from "./events.js";
 const logoutRequests = new WeakMap();
 const logoutInProgress = new WeakSet();
 const isLogoutInProgress = client => logoutInProgress.has(client);
@@ -16,12 +15,11 @@ const logoutSession = client => {
   logoutInProgress.add(key);
   const request = (async () => {
     try {
-      await client.logout();
+      await client.auth.logout();
     } finally {
       await signOutGoogleIfNeeded();
     }
   })().finally(() => {
-    notifySessionChanged();
     logoutRequests.delete(key);
     logoutInProgress.delete(key);
   });

package/lib/module/modules/auth/session/logout-session.js.map

@@ -1 +1 @@
-{"version":3,"names":["signOutGoogleIfNeeded","notifySessionChanged","logoutRequests","WeakMap","logoutInProgress","WeakSet","isLogoutInProgress","client","has","logoutSession","key","pending","get","add","request","logout","finally","delete","set"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/logout-session.ts"],"mappings":";;AAAA,SAASA,qBAAqB,QAAQ,6BAA0B;AAEhE,SAASC,oBAAoB,QAAQ,aAAU;AAM/C,MAAMC,cAAc,GAAG,IAAIC,OAAO,CAAwB,CAAC;AAC3D,MAAMC,gBAAgB,GAAG,IAAIC,OAAO,CAAS,CAAC;AAE9C,MAAMC,kBAAkB,GAAIC,MAAc,IACxCH,gBAAgB,CAACI,GAAG,CAACD,MAAM,CAAC;;AAE9B;AACA,MAAME,aAAa,GAAIF,MAA2B,IAAoB;EACpE,MAAMG,GAAG,GAAGH,MAAgB;EAC5B,MAAMI,OAAO,GAAGT,cAAc,CAACU,GAAG,CAACF,GAAG,CAAC;EAEvC,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO;EAChB;EAEAP,gBAAgB,CAACS,GAAG,CAACH,GAAG,CAAC;EAEzB,MAAMI,OAAO,GAAG,CAAC,YAAY;IAC3B,IAAI;MACF,MAAMP,MAAM,CAACQ,MAAM,CAAC,CAAC;IACvB,CAAC,SAAS;MACR,MAAMf,qBAAqB,CAAC,CAAC;IAC/B;EACF,CAAC,EAAE,CAAC,CAACgB,OAAO,CAAC,MAAM;IACjBf,oBAAoB,CAAC,CAAC;IACtBC,cAAc,CAACe,MAAM,CAACP,GAAG,CAAC;IAC1BN,gBAAgB,CAACa,MAAM,CAACP,GAAG,CAAC;EAC9B,CAAC,CAAC;EAEFR,cAAc,CAACgB,GAAG,CAACR,GAAG,EAAEI,OAAO,CAAC;EAEhC,OAAOA,OAAO;AAChB,CAAC;AAED,SAASR,kBAAkB,EAAEG,aAAa","ignoreList":[]}
+{"version":3,"names":["signOutGoogleIfNeeded","logoutRequests","WeakMap","logoutInProgress","WeakSet","isLogoutInProgress","client","has","logoutSession","key","pending","get","add","request","auth","logout","finally","delete","set"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/logout-session.ts"],"mappings":";;AAEA,SAASA,qBAAqB,QAAQ,6BAA0B;AAEhE,MAAMC,cAAc,GAAG,IAAIC,OAAO,CAAwB,CAAC;AAC3D,MAAMC,gBAAgB,GAAG,IAAIC,OAAO,CAAS,CAAC;AAE9C,MAAMC,kBAAkB,GAAIC,MAAc,IACxCH,gBAAgB,CAACI,GAAG,CAACD,MAAM,CAAC;;AAE9B;AACA,MAAME,aAAa,GAAIF,MAAY,IAAoB;EACrD,MAAMG,GAAG,GAAGH,MAAgB;EAC5B,MAAMI,OAAO,GAAGT,cAAc,CAACU,GAAG,CAACF,GAAG,CAAC;EAEvC,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO;EAChB;EAEAP,gBAAgB,CAACS,GAAG,CAACH,GAAG,CAAC;EAEzB,MAAMI,OAAO,GAAG,CAAC,YAAY;IAC3B,IAAI;MACF,MAAMP,MAAM,CAACQ,IAAI,CAACC,MAAM,CAAC,CAAC;IAC5B,CAAC,SAAS;MACR,MAAMf,qBAAqB,CAAC,CAAC;IAC/B;EACF,CAAC,EAAE,CAAC,CAACgB,OAAO,CAAC,MAAM;IACjBf,cAAc,CAACgB,MAAM,CAACR,GAAG,CAAC;IAC1BN,gBAAgB,CAACc,MAAM,CAACR,GAAG,CAAC;EAC9B,CAAC,CAAC;EAEFR,cAAc,CAACiB,GAAG,CAACT,GAAG,EAAEI,OAAO,CAAC;EAEhC,OAAOA,OAAO;AAChB,CAAC;AAED,SAASR,kBAAkB,EAAEG,aAAa","ignoreList":[]}

package/lib/module/modules/auth/session/session-snapshot.js

@@ -0,0 +1,28 @@
+"use strict";
+
+const initialSnapshot = {
+  status: "loading",
+  accounts: [],
+  sessions: [],
+  switching: false
+};
+const profileFor = async (client, reference) => {
+  const [type, id] = reference.split("/");
+  if (!id || type !== "Patient" && type !== "Practitioner" && type !== "RelatedPerson") {
+    throw new Error("The session has an invalid profile reference.");
+  }
+  return client.fhir.read(type, id);
+};
+const signedOutSnapshot = (accounts, previous, requested = false) => ({
+  status: "signed-out",
+  accounts,
+  sessions: [],
+  switching: previous.switching,
+  activeAccountId: undefined,
+  profile: undefined,
+  profileAccountId: undefined,
+  error: undefined,
+  reason: !requested && (previous.status === "authenticated" || previous.status === "offline") ? "session-ended" : undefined
+});
+export { initialSnapshot, profileFor, signedOutSnapshot };
+//# sourceMappingURL=session-snapshot.js.map

package/lib/module/modules/auth/session/session-snapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["initialSnapshot","status","accounts","sessions","switching","profileFor","client","reference","type","id","split","Error","fhir","read","signedOutSnapshot","previous","requested","activeAccountId","undefined","profile","profileAccountId","error","reason"],"sourceRoot":"../../../../../src","sources":["modules/auth/session/session-snapshot.ts"],"mappings":";;AAmBA,MAAMA,eAAgC,GAAG;EACvCC,MAAM,EAAE,SAAS;EACjBC,QAAQ,EAAE,EAAE;EACZC,QAAQ,EAAE,EAAE;EACZC,SAAS,EAAE;AACb,CAAC;AAED,MAAMC,UAAU,GAAG,MAAAA,CAAOC,MAAY,EAAEC,SAAiB,KAAuB;EAC9E,MAAM,CAACC,IAAI,EAAEC,EAAE,CAAC,GAAGF,SAAS,CAACG,KAAK,CAAC,GAAG,CAAC;EAEvC,IAAI,CAACD,EAAE,IAAKD,IAAI,KAAK,SAAS,IAAIA,IAAI,KAAK,cAAc,IAAIA,IAAI,KAAK,eAAgB,EAAE;IACtF,MAAM,IAAIG,KAAK,CAAC,+CAA+C,CAAC;EAClE;EAEA,OAAOL,MAAM,CAACM,IAAI,CAACC,IAAI,CAACL,IAAI,EAAEC,EAAE,CAAC;AACnC,CAAC;AAED,MAAMK,iBAAiB,GAAGA,CACxBZ,QAAwB,EACxBa,QAAyB,EACzBC,SAAS,GAAG,KAAK,MACI;EACrBf,MAAM,EAAE,YAAY;EACpBC,QAAQ;EACRC,QAAQ,EAAE,EAAE;EACZC,SAAS,EAAEW,QAAQ,CAACX,SAAS;EAC7Ba,eAAe,EAAEC,SAAS;EAC1BC,OAAO,EAAED,SAAS;EAClBE,gBAAgB,EAAEF,SAAS;EAC3BG,KAAK,EAAEH,SAAS;EAChBI,MAAM,EAAE,CAACN,SAAS,KAAKD,QAAQ,CAACd,MAAM,KAAK,eAAe,IAAIc,QAAQ,CAACd,MAAM,KAAK,SAAS,CAAC,GACxF,eAAe,GACfiB;AACN,CAAC,CAAC;AAEF,SAASlB,eAAe,EAAEK,UAAU,EAAES,iBAAiB","ignoreList":[]}

package/lib/module/modules/auth/sign-in/components/form/login-form-provider.js

@@ -47,13 +47,13 @@ export const LoginFormProvider = ({
           email: values.email,
           password: values.password
         });
-        if ("verify" in loginResponse) {
-          setMfaStep(loginResponse);
+        if (loginResponse.status === "mfa-required") {
+          setMfaStep(loginResponse.challenge);
           setMfaCode("");
           setMfaError(null);
           return;
         }
-        onSuccess?.(loginResponse);
+        onSuccess?.(loginResponse.session);
       } catch (error) {
         applySubmitError(error, formikHelpers, {
           onError,
@@ -70,9 +70,14 @@ export const LoginFormProvider = ({
     setMfaError(null);
     try {
       const loginResponse = await verifyMfaAction(mfaStep, mfaCode.trim());
-      setMfaStep(null);
-      setMfaCode("");
-      onSuccess?.(loginResponse);
+      if (loginResponse.status === "mfa-required") {
+        setMfaStep(loginResponse.challenge);
+        setMfaCode("");
+      } else {
+        setMfaStep(null);
+        setMfaCode("");
+        onSuccess?.(loginResponse.session);
+      }
     } catch (error) {
       const {
         error: signInError

package/lib/module/modules/auth/sign-in/components/form/login-form-provider.js.map

@@ -1 +1 @@
-{"version":3,"names":["useFormik","React","useShallowStableValue","useSignIn","applySubmitError","parseSignInError","LoginFormContext","createLoginValidationSchema","jsx","_jsx","LoginFormProvider","children","customValidations","loginType","tenantCode","onSubmit","onSuccess","onError","signInAction","type","verifyMfaAction","verifyMfa","mfaStep","setMfaStep","useState","mfaCode","setMfaCode","mfaError","setMfaError","loginValidationSchema","useMemo","formik","initialValues","email","password","submit","validateOnBlur","validationSchema","values","formikHelpers","loginResponse","run","error","mapFields","useCallback","trim","isSubmitting","setSubmitting","signInError","isMfaVerification","message","contextValue","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/form/login-form-provider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useFormik","React","useShallowStableValue","useSignIn","applySubmitError","parseSignInError","LoginFormContext","createLoginValidationSchema","jsx","_jsx","LoginFormProvider","children","customValidations","loginType","tenantCode","onSubmit","onSuccess","onError","signInAction","type","verifyMfaAction","verifyMfa","mfaStep","setMfaStep","useState","mfaCode","setMfaCode","mfaError","setMfaError","loginValidationSchema","useMemo","formik","initialValues","email","password","submit","validateOnBlur","validationSchema","values","formikHelpers","loginResponse","run","status","challenge","session","error","mapFields","useCallback","trim","isSubmitting","setSubmitting","signInError","isMfaVerification","message","contextValue","Provider","value"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/form/login-form-provider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/auth/sign-in/components/social-logins/apple-login-button.js

@@ -1,9 +1,8 @@
 "use strict";
 
-import { useClient } from "@ovok/core";
+import { useOvok } from "@ovok/core/next/react";
 import * as AppleAuthentication from "expo-apple-authentication";
 import React from "react";
-import { saveLogin } from "../../../session/save-login.js";
 import { parseSignInError } from "../../../utils/sign-in-error.js";
 import { SocialLoginButton } from "./social-login-button.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -17,7 +16,7 @@ export const AppleLoginButton = ({
   children,
   ...props
 }) => {
-  const client = useClient();
+  const client = useOvok();
   const [isAppleLoginAvailable, setIsAppleLoginAvailable] = React.useState(false);
   const [isLoading, setIsLoading] = React.useState(false);
   const handleAppleLogin = React.useCallback(async () => {
@@ -29,14 +28,13 @@ export const AppleLoginButton = ({
       if (credentials.identityToken == null || credentials.authorizationCode == null) {
         throw new Error("Missing required credentials");
       }
-      const loginResponse = await client.appleLogin({
+      const loginResponse = await client.auth.socialLogin("apple", {
         ...credentials,
         identityToken: credentials.identityToken,
         authorizationCode: credentials.authorizationCode,
         email: credentials.email ?? "",
         internalId
       });
-      await saveLogin(client, loginResponse);
       onSuccess?.(loginResponse);
     } catch (cause) {
       const error = cause;

package/lib/module/modules/auth/sign-in/components/social-logins/apple-login-button.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","AppleAuthentication","React","saveLogin","parseSignInError","SocialLoginButton","jsx","_jsx","AppleLoginButton","testID","internalId","onSuccess","onError","style","disabled","children","props","client","isAppleLoginAvailable","setIsAppleLoginAvailable","useState","isLoading","setIsLoading","handleAppleLogin","useCallback","credentials","signInAsync","requestedScopes","AppleAuthenticationScope","FULL_NAME","EMAIL","identityToken","authorizationCode","Error","loginResponse","appleLogin","email","cause","error","code","useEffect","isAvailableAsync","then","catch","backgroundColor","onPress"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/social-logins/apple-login-button.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","AppleAuthentication","React","parseSignInError","SocialLoginButton","jsx","_jsx","AppleLoginButton","testID","internalId","onSuccess","onError","style","disabled","children","props","client","isAppleLoginAvailable","setIsAppleLoginAvailable","useState","isLoading","setIsLoading","handleAppleLogin","useCallback","credentials","signInAsync","requestedScopes","AppleAuthenticationScope","FULL_NAME","EMAIL","identityToken","authorizationCode","Error","loginResponse","auth","socialLogin","email","cause","error","code","useEffect","isAvailableAsync","then","catch","backgroundColor","onPress"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/social-logins/apple-login-button.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,uBAAuB;AAC/C,OAAO,KAAKC,mBAAmB,MAAM,2BAA2B;AAChE,OAAOC,KAAK,MAAM,OAAO;AAEzB,SAASC,gBAAgB,QAAQ,iCAA8B;AAG/D,SAASC,iBAAiB,QAAQ,0BAAuB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE1D,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAC/BC,MAAM;EACNC,UAAU;EACVC,SAAS;EACTC,OAAO;EACPC,KAAK;EACLC,QAAQ;EACRC,QAAQ;EACR,GAAGC;AACqC,CAAC,KAAK;EAC9C,MAAMC,MAAM,GAAGhB,OAAO,CAAC,CAAC;EAExB,MAAM,CAACiB,qBAAqB,EAAEC,wBAAwB,CAAC,GACrDhB,KAAK,CAACiB,QAAQ,CAAC,KAAK,CAAC;EAEvB,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGnB,KAAK,CAACiB,QAAQ,CAAC,KAAK,CAAC;EAEvD,MAAMG,gBAAgB,GAAGpB,KAAK,CAACqB,WAAW,CAAC,YAAY;IACrD,IAAI;MACFF,YAAY,CAAC,IAAI,CAAC;MAClB,MAAMG,WAAW,GAAG,MAAMvB,mBAAmB,CAACwB,WAAW,CAAC;QACxDC,eAAe,EAAE,CACfzB,mBAAmB,CAAC0B,wBAAwB,CAACC,SAAS,EACtD3B,mBAAmB,CAAC0B,wBAAwB,CAACE,KAAK;MAEtD,CAAC,CAAC;MAEF,IACEL,WAAW,CAACM,aAAa,IAAI,IAAI,IACjCN,WAAW,CAACO,iBAAiB,IAAI,IAAI,EACrC;QACA,MAAM,IAAIC,KAAK,CAAC,8BAA8B,CAAC;MACjD;MAEA,MAAMC,aAAa,GAAG,MAAMjB,MAAM,CAACkB,IAAI,CAACC,WAAW,CAAC,OAAO,EAAE;QAC3D,GAAGX,WAAW;QACdM,aAAa,EAAEN,WAAW,CAACM,aAAa;QACxCC,iBAAiB,EAAEP,WAAW,CAACO,iBAAiB;QAChDK,KAAK,EAAEZ,WAAW,CAACY,KAAK,IAAI,EAAE;QAC9B3B;MACF,CAAC,CAAC;MAEFC,SAAS,GAAGuB,aAAa,CAAC;IAC5B,CAAC,CAAC,OAAOI,KAAK,EAAE;MACd,MAAMC,KAAK,GAAGD,KAAkC;MAEhD,IACEC,KAAK,CAACC,IAAI,KAAK,sBAAsB,IACrCD,KAAK,CAACC,IAAI,KAAK,qBAAqB,EACpC;QACA5B,OAAO,GAAGR,gBAAgB,CAACmC,KAAK,CAAC,CAACA,KAAK,CAAC;MAC1C;IACF,CAAC,SAAS;MACRjB,YAAY,CAAC,KAAK,CAAC;IACrB;EACF,CAAC,EAAE,CAACL,MAAM,EAAEP,UAAU,EAAEE,OAAO,EAAED,SAAS,CAAC,CAAC;EAE5CR,KAAK,CAACsC,SAAS,CAAC,MAAM;IACpBvC,mBAAmB,CAACwC,gBAAgB,CAAC,CAAC,CACnCC,IAAI,CAACxB,wBAAwB,CAAC,CAC9ByB,KAAK,CAAEL,KAAc,IAAK3B,OAAO,GAAGR,gBAAgB,CAACmC,KAAK,CAAC,CAACA,KAAK,CAAC,CAAC;EACxE,CAAC,EAAE,CAAC3B,OAAO,CAAC,CAAC;EAEb,IAAI,CAACM,qBAAqB,EAAE;IAC1B,OAAO,IAAI;EACb;EAEA,oBACEX,IAAA,CAACF,iBAAiB;IAAA,GACZW,KAAK;IACT6B,eAAe,EAAC,MAAM;IACtBhC,KAAK,EAAEA,KAAM;IACbC,QAAQ,EAAEA,QAAQ,IAAIO,SAAU;IAChCyB,OAAO,EAAEvB,gBAAiB;IAC1Bd,MAAM,EAAEA,MAAO;IAAAM,QAAA,EAEdA;EAAQ,CACQ,CAAC;AAExB,CAAC","ignoreList":[]}

package/lib/module/modules/auth/sign-in/components/social-logins/google-login-button.js

@@ -1,11 +1,10 @@
 "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 React from "react";
 import { slog } from "../../../../helpers/index.js";
 import { useAppTheme } from "../../../../theme/index.js";
-import { saveLogin } from "../../../session/save-login.js";
 import { parseSignInError } from "../../../utils/sign-in-error.js";
 import { SocialLoginButton } from "./social-login-button.js";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -22,7 +21,7 @@ export const GoogleLoginButton = ({
   ...props
 }) => {
   const theme = useAppTheme();
-  const client = useClient();
+  const client = useOvok();
   const [isConfigured, setIsConfigured] = React.useState(false);
   const [isLoading, setIsLoading] = React.useState(false);
   const isDisabled = isLoading || !isConfigured || disabled;
@@ -45,11 +44,10 @@ export const GoogleLoginButton = ({
     try {
       setIsLoading(true);
       const idToken = await handleGetIdToken();
-      const loginResponse = await client.googleLogin({
+      const loginResponse = await client.auth.socialLogin("google", {
         idToken,
         internalId
       });
-      await saveLogin(client, loginResponse);
       onSuccess?.(loginResponse);
     } catch (error) {
       if (!isCancelledResponse(error)) {

package/lib/module/modules/auth/sign-in/components/social-logins/google-login-button.js.map

@@ -1 +1 @@
-{"version":3,"names":["useClient","GoogleSignin","isCancelledResponse","isSuccessResponse","React","slog","useAppTheme","saveLogin","parseSignInError","SocialLoginButton","jsx","_jsx","GoogleLoginButton","googleIosClientId","googleWebClientId","internalId","onSuccess","onError","testID","style","disabled","children","props","theme","client","isConfigured","setIsConfigured","useState","isLoading","setIsLoading","isDisabled","handleGetIdToken","useCallback","hasPlayServices","Error","response","signIn","tokens","getTokens","idToken","handleGoogleSignIn","loginResponse","googleLogin","error","useEffect","configure","iosClientId","webClientId","backgroundColor","dark","onPress"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/social-logins/google-login-button.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useOvok","GoogleSignin","isCancelledResponse","isSuccessResponse","React","slog","useAppTheme","parseSignInError","SocialLoginButton","jsx","_jsx","GoogleLoginButton","googleIosClientId","googleWebClientId","internalId","onSuccess","onError","testID","style","disabled","children","props","theme","client","isConfigured","setIsConfigured","useState","isLoading","setIsLoading","isDisabled","handleGetIdToken","useCallback","hasPlayServices","Error","response","signIn","tokens","getTokens","idToken","handleGoogleSignIn","loginResponse","auth","socialLogin","error","useEffect","configure","iosClientId","webClientId","backgroundColor","dark","onPress"],"sourceRoot":"../../../../../../../src","sources":["modules/auth/sign-in/components/social-logins/google-login-button.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/auth/utils/sign-in-error.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { readOvokError } from "@ovok/core";
+import { OvokError } from "@ovok/core/next";
 const asRecord = value => typeof value === "object" && value !== null ? value : undefined;
 const parseJsonRecord = value => {
   if (typeof value !== "string") {
@@ -53,14 +53,14 @@ const parseSignInError = (error, options = {}) => {
   const body = parseJsonRecord(originalMessage) ?? asRecord(root?.body) ?? asRecord(root?.data) ?? asRecord(response?.data) ?? asRecord(response?.body) ?? root;
   const nestedError = asRecord(body?.error);
   const status = numberValue(root?.status, root?.statusCode, response?.status, body?.status, body?.statusCode);
-  const retryAfterMs = numberValue(root?.retryAfterMs, readOvokError(error).retryAfterMs);
+  const retryAfterSeconds = numberValue(body?.retryAfterSec);
+  const retryAfterMs = numberValue(root?.retryAfterMs, body?.retryAfterMs, retryAfterSeconds === undefined ? undefined : retryAfterSeconds * 1000);
   const code = stringValue(body?.code, nestedError?.code, root?.code);
   const requestId = stringValue(body?.requestId, root?.requestId);
-
-  // `@ovok/core` reads every body shape, problem `errors[]` included, into entries that always carry a path.
-  const {
-    fieldErrors
-  } = readOvokError(error);
+  const fieldErrors = error instanceof OvokError ? error.fieldErrors : Array.isArray(body?.errors) ? body.errors.filter(item => {
+    const field = asRecord(item);
+    return Array.isArray(field?.path) && typeof field?.message === "string";
+  }) : [];
   const genericErrorKey = options.errorScope ? `${options.errorScope}.errors.generic` : "sign-in.errors.generic";
   const networkErrorKey = options.errorScope ? `${options.errorScope}.errors.network` : "sign-in.errors.network";
   const message = messageKeyForStatus(status, options.isMfaVerification === true, options.isSignIn !== false) ?? (status === undefined && isNetworkError(error, originalMessage) ? networkErrorKey : genericErrorKey);