@ovok/core 0.4.26 → 0.4.27

package/dist/client/auth/account-storage.d.ts

@@ -0,0 +1,5 @@
+import { IClientStorage } from "@medplum/core";
+export declare const LOGINS_STORAGE_KEY = "logins";
+export declare const EXPIRED_ACCOUNTS_STORAGE_KEY = "ovok.core.expired-accounts";
+export declare const setStoredAccountExpired: (storage: IClientStorage, accountId: string, expired: boolean) => void;
+export declare const removeStoredAccount: (storage: IClientStorage, accountId: string) => void;

package/dist/client/auth/account-storage.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeStoredAccount = exports.setStoredAccountExpired = exports.EXPIRED_ACCOUNTS_STORAGE_KEY = exports.LOGINS_STORAGE_KEY = void 0;
+exports.LOGINS_STORAGE_KEY = "logins";
+exports.EXPIRED_ACCOUNTS_STORAGE_KEY = "ovok.core.expired-accounts";
+const setStoredAccountExpired = (storage, accountId, expired) => {
+    var _a;
+    const expiredAccountIds = new Set((_a = storage.getObject(exports.EXPIRED_ACCOUNTS_STORAGE_KEY)) !== null && _a !== void 0 ? _a : []);
+    if (expired) {
+        expiredAccountIds.add(accountId);
+    }
+    else {
+        expiredAccountIds.delete(accountId);
+    }
+    if (expiredAccountIds.size > 0) {
+        storage.setObject(exports.EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
+    }
+    else {
+        storage.setString(exports.EXPIRED_ACCOUNTS_STORAGE_KEY, undefined);
+    }
+};
+exports.setStoredAccountExpired = setStoredAccountExpired;
+const removeStoredAccount = (storage, accountId) => {
+    var _a;
+    const logins = (_a = storage.getObject(exports.LOGINS_STORAGE_KEY)) !== null && _a !== void 0 ? _a : [];
+    storage.setObject(exports.LOGINS_STORAGE_KEY, logins.filter((login) => { var _a; return ((_a = login.profile) === null || _a === void 0 ? void 0 : _a.reference) !== accountId; }));
+    (0, exports.setStoredAccountExpired)(storage, accountId, false);
+};
+exports.removeStoredAccount = removeStoredAccount;

package/dist/client/auth/methods/logout.d.ts

@@ -1,3 +1,3 @@
 import { OvokClient } from "../../ovok-client";
-/** Revokes the current server session and always clears the local login. */
+/** Revokes the current server session and always removes its local account. */
 export declare function logout(this: OvokClient): Promise<void>;

package/dist/client/auth/methods/logout.js

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logout = logout;
-/** Revokes the current server session and always clears the local login. */
+const account_storage_1 = require("../account-storage");
+/** Revokes the current server session and always removes its local account. */
 async function logout() {
+    var _a, _b;
+    const accountId = (_b = (_a = this.getActiveLogin()) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.reference;
     try {
         await this.delete("auth/session/current");
     }
     finally {
         this.clearActiveLogin();
+        if (accountId && this.clientStorage) {
+            (0, account_storage_1.removeStoredAccount)(this.clientStorage, accountId);
+        }
     }
 }

package/dist/client/ovok-client.d.ts

@@ -52,7 +52,8 @@ export declare class OvokClient extends MedplumClient {
     switchAccount(accountId: string): Promise<void>;
     /**
      * Ends the selected account's current server session and removes its saved login.
-     * The account is retained locally if the server cannot confirm the logout.
+     * Accounts with an expired server session are removed locally; network and service
+     * failures retain the account so it can be removed after connectivity returns.
      */
     removeAccount(accountId: string): Promise<void>;
     /** Removes every saved account and expiry marker from client storage. */
@@ -79,6 +80,8 @@ export declare class OvokClient extends MedplumClient {
     private getLogin;
     private getExpiredAccountIds;
     private setAccountExpired;
+    private removeSavedAccount;
+    private syncSavedAccountProfile;
     private restoreActiveLogin;
     private executeConditionalObservationCreates;
     private executeObservationBundle;

package/dist/client/ovok-client.js

@@ -38,6 +38,7 @@ exports.OvokClient = exports.MAX_OBSERVATION_BUNDLE_BYTES = exports.MAX_CONDITIO
 const core_1 = require("@medplum/core");
 const capability_1 = require("../conformance/capability");
 const aiFhirMethods = __importStar(require("./ai-fhir/methods"));
+const account_storage_1 = require("./auth/account-storage");
 const authMethods = __importStar(require("./auth/methods"));
 const botMethods = __importStar(require("./bot/methods"));
 const changeHistoryMethods = __importStar(require("./change-history/methods"));
@@ -63,20 +64,51 @@ const slimMethods = __importStar(require("./slim/methods"));
 exports.MAX_CONDITIONAL_OBSERVATION_ENTRIES = 8;
 var observation_bundle_utils_2 = require("./observation/observation-bundle-utils");
 Object.defineProperty(exports, "MAX_OBSERVATION_BUNDLE_BYTES", { enumerable: true, get: function () { return observation_bundle_utils_2.MAX_OBSERVATION_BUNDLE_BYTES; } });
-const LOGINS_STORAGE_KEY = "logins";
-const EXPIRED_ACCOUNTS_STORAGE_KEY = "ovok.core.expired-accounts";
+const isNetworkError = (error) => {
+    if (!(error instanceof Error)) {
+        return false;
+    }
+    if (error.name === "NetworkError" ||
+        error.name === "UnknownHostException" ||
+        /network request failed|failed to fetch|load failed|unknownhostexception|econn|enotfound/i.test(error.message)) {
+        return true;
+    }
+    return isNetworkError(error.cause);
+};
 class OvokClient extends core_1.MedplumClient {
     /**
      * @param config - The configuration for the client.
      * @param config.socialLoginClientId - The social login client id to use for the client.
      */
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const storage = (_a = config.storage) !== null && _a !== void 0 ? _a : new core_1.ClientStorage();
-        super({ ...config, storage });
+        const fetchImplementation = (_b = config.fetch) !== null && _b !== void 0 ? _b : globalThis.fetch.bind(globalThis);
+        const baseUrl = (_c = config.baseUrl) !== null && _c !== void 0 ? _c : "https://api.medplum.com/";
+        const normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`;
+        const tokenUrl = new URL((_d = config.tokenUrl) !== null && _d !== void 0 ? _d : "oauth2/token", normalizedBaseUrl).href;
+        super({
+            ...config,
+            storage,
+            fetch: async (url, options) => {
+                var _a, _b;
+                const response = await fetchImplementation(url, options);
+                const requestUrl = new URL(url, normalizedBaseUrl);
+                const refreshRefused = requestUrl.href === tokenUrl && [400, 401, 403].includes(response.status);
+                const sessionEnded = requestUrl.pathname.endsWith("/auth/session/current") && response.status === 401;
+                if (refreshRefused || sessionEnded) {
+                    const accountId = (_b = (_a = storage.getObject("activeLogin")) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.reference;
+                    if (accountId) {
+                        (0, account_storage_1.setStoredAccountExpired)(storage, accountId, true);
+                    }
+                }
+                return response;
+            },
+        });
         this.socialLoginClientId = "";
         this.hasExplicitStorageAdapter = config.storage !== undefined;
-        this.socialLoginClientId = (_b = config.socialLoginClientId) !== null && _b !== void 0 ? _b : "";
+        this.socialLoginClientId = (_e = config.socialLoginClientId) !== null && _e !== void 0 ? _e : "";
+        this.addEventListener("profileRefreshed", () => this.syncSavedAccountProfile());
         this.bindMethods(authMethods);
         this.bindMethods(observationMethods);
         this.bindMethods(questionnaireResponseMethods);
@@ -101,7 +133,7 @@ class OvokClient extends core_1.MedplumClient {
             return (0, errors_1.isSignalsError)(mapped) ? mapped : (0, ovok_error_1.mapOvokApiError)(mapped);
         });
         this.clientStorage = storage;
-        this.offlineQueueOptions = (_c = config.offlineQueue) !== null && _c !== void 0 ? _c : {};
+        this.offlineQueueOptions = (_f = config.offlineQueue) !== null && _f !== void 0 ? _f : {};
     }
     /** Lists saved accounts without exposing their access or refresh tokens. */
     getSavedAccounts() {
@@ -124,6 +156,7 @@ class OvokClient extends core_1.MedplumClient {
     }
     /** Activates a previously saved account without asking for its password again. */
     async switchAccount(accountId) {
+        var _a, _b;
         const login = this.getLogin(accountId);
         if (!login) {
             throw new Error(`No saved account found for ${accountId}.`);
@@ -131,34 +164,68 @@ class OvokClient extends core_1.MedplumClient {
         if (this.getExpiredAccountIds().includes(accountId)) {
             throw new Error("This account's session has expired. Sign in again.");
         }
-        await this.setActiveLogin(login);
+        const previousLogin = this.getActiveLogin();
+        try {
+            await this.setActiveLogin(login);
+        }
+        catch (error) {
+            const activeLogin = this.getActiveLogin();
+            if (((_a = activeLogin === null || activeLogin === void 0 ? void 0 : activeLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) === accountId && isNetworkError(error)) {
+                return;
+            }
+            if (!activeLogin &&
+                previousLogin &&
+                ((_b = previousLogin.profile) === null || _b === void 0 ? void 0 : _b.reference) !== accountId) {
+                await this.restoreActiveLogin(previousLogin);
+            }
+            throw error;
+        }
     }
     /**
      * Ends the selected account's current server session and removes its saved login.
-     * The account is retained locally if the server cannot confirm the logout.
+     * Accounts with an expired server session are removed locally; network and service
+     * failures retain the account so it can be removed after connectivity returns.
      */
     async removeAccount(accountId) {
-        var _a, _b;
+        var _a;
         const login = this.getLogin(accountId);
         if (!login) {
             throw new Error(`No saved account found for ${accountId}.`);
         }
         const previousLogin = this.getActiveLogin();
+        const previousAccountId = (_a = previousLogin === null || previousLogin === void 0 ? void 0 : previousLogin.profile) === null || _a === void 0 ? void 0 : _a.reference;
         try {
             await this.setActiveLogin(login);
             await this.delete("auth/session/current");
         }
         catch (error) {
-            if (previousLogin && previousLogin.profile.reference !== accountId) {
+            if (this.getExpiredAccountIds().includes(accountId)) {
+                this.removeSavedAccount(accountId);
+                if (previousLogin && previousAccountId && previousAccountId !== accountId) {
+                    await this.restoreActiveLogin(previousLogin);
+                }
+                else {
+                    this.clearActiveLogin();
+                }
+                return;
+            }
+            if (previousLogin && previousAccountId !== accountId) {
                 await this.restoreActiveLogin(previousLogin);
             }
             throw error;
         }
         this.clearActiveLogin();
-        const remainingLogins = this.getLogins().filter((savedLogin) => savedLogin.profile.reference !== accountId);
-        (_a = this.clientStorage) === null || _a === void 0 ? void 0 : _a.setObject(LOGINS_STORAGE_KEY, remainingLogins);
-        this.setAccountExpired(accountId, false);
-        const nextLogin = (_b = ((previousLogin === null || previousLogin === void 0 ? void 0 : previousLogin.profile.reference) !== accountId ? previousLogin : undefined)) !== null && _b !== void 0 ? _b : remainingLogins[0];
+        this.removeSavedAccount(accountId);
+        const availableAccountIds = new Set(this.getSavedAccounts().filter((account) => !account.expired).map((account) => account.id));
+        let nextLogin;
+        if (previousAccountId && previousAccountId !== accountId) {
+            if (availableAccountIds.has(previousAccountId)) {
+                nextLogin = previousLogin;
+            }
+        }
+        else if (previousAccountId === accountId) {
+            nextLogin = this.getLogins().find((savedLogin) => { var _a, _b; return availableAccountIds.has((_b = (_a = savedLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) !== null && _b !== void 0 ? _b : ""); });
+        }
         if (nextLogin) {
             await this.restoreActiveLogin(nextLogin);
         }
@@ -268,10 +335,10 @@ class OvokClient extends core_1.MedplumClient {
         const queuedMeasurements = storage === null || storage === void 0 ? void 0 : storage.getObject(queueKey);
         super.clear();
         if (logins.length > 0) {
-            storage === null || storage === void 0 ? void 0 : storage.setObject(LOGINS_STORAGE_KEY, logins);
+            storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.LOGINS_STORAGE_KEY, logins);
         }
         if (expiredAccountIds.size > 0) {
-            storage === null || storage === void 0 ? void 0 : storage.setObject(EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
+            storage === null || storage === void 0 ? void 0 : storage.setObject(account_storage_1.EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
         }
         if (Array.isArray(queuedMeasurements)) {
             storage === null || storage === void 0 ? void 0 : storage.setObject(queueKey, queuedMeasurements);
@@ -282,23 +349,32 @@ class OvokClient extends core_1.MedplumClient {
     }
     getExpiredAccountIds() {
         var _a, _b;
-        return ((_b = (_a = this.clientStorage) === null || _a === void 0 ? void 0 : _a.getObject(EXPIRED_ACCOUNTS_STORAGE_KEY)) !== null && _b !== void 0 ? _b : []);
+        return ((_b = (_a = this.clientStorage) === null || _a === void 0 ? void 0 : _a.getObject(account_storage_1.EXPIRED_ACCOUNTS_STORAGE_KEY)) !== null && _b !== void 0 ? _b : []);
     }
     setAccountExpired(accountId, expired) {
-        var _a, _b;
-        const expiredAccountIds = new Set(this.getExpiredAccountIds());
-        if (expired) {
-            expiredAccountIds.add(accountId);
+        if (this.clientStorage) {
+            (0, account_storage_1.setStoredAccountExpired)(this.clientStorage, accountId, expired);
         }
-        else {
-            expiredAccountIds.delete(accountId);
-        }
-        if (expiredAccountIds.size > 0) {
-            (_a = this.clientStorage) === null || _a === void 0 ? void 0 : _a.setObject(EXPIRED_ACCOUNTS_STORAGE_KEY, Array.from(expiredAccountIds));
+    }
+    removeSavedAccount(accountId) {
+        if (this.clientStorage) {
+            (0, account_storage_1.removeStoredAccount)(this.clientStorage, accountId);
         }
-        else {
-            (_b = this.clientStorage) === null || _b === void 0 ? void 0 : _b.setString(EXPIRED_ACCOUNTS_STORAGE_KEY, undefined);
+    }
+    syncSavedAccountProfile() {
+        var _a, _b, _c;
+        const login = this.getActiveLogin();
+        const profile = this.getProfile();
+        const accountId = (_a = login === null || login === void 0 ? void 0 : login.profile) === null || _a === void 0 ? void 0 : _a.reference;
+        if (!login || !profile || !accountId) {
+            return;
         }
+        const updatedLogin = {
+            ...login,
+            profile: { ...login.profile, display: (0, core_1.getDisplayString)(profile) },
+        };
+        (_b = this.clientStorage) === null || _b === void 0 ? void 0 : _b.setObject("activeLogin", updatedLogin);
+        (_c = this.clientStorage) === null || _c === void 0 ? void 0 : _c.setObject(account_storage_1.LOGINS_STORAGE_KEY, this.getLogins().map((savedLogin) => { var _a; return ((_a = savedLogin.profile) === null || _a === void 0 ? void 0 : _a.reference) === accountId ? updatedLogin : savedLogin; }));
     }
     async restoreActiveLogin(login) {
         try {

package/dist/conformance/capability-requirements.js

@@ -48,7 +48,7 @@ exports.OVOK_CORE_REQUIREMENTS = {
     description: "The FHIR surface a server must provide for the @ovok/core client library's own methods to function.",
     software: {
         name: "@ovok/core",
-        version: "0.4.26",
+        version: "0.4.27",
     },
     fhirVersion: "4.0.1",
     format: ["json"],

package/dist/hooks/observation-hooks.js

@@ -45,22 +45,18 @@ const useObservations = ({ types, period, patientId, id, groupBy, timeToleranceM
     // A broad search is intentional: one measurement can expand into several
     // observations, and the inverse mapper performs the type-specific grouping.
     const codes = React.useMemo(() => (0, observationsToMeasurements_1.observationCodesForTypes)(types), [types]);
-    const query = React.useMemo(() => ({
-        ...(codes ? { code: codes } : {}),
-        ...(patientId ? { subject: `Patient/${patientId}` } : {}),
-        ...(id ? { _id: id } : {}),
-        ...((period === null || period === void 0 ? void 0 : period.start) || (period === null || period === void 0 ? void 0 : period.end)
-            ? {
-                date: [
-                    ...(period.start ? [`ge${period.start.toISOString()}`] : []),
-                    ...(period.end ? [`le${period.end.toISOString()}`] : []),
-                ],
-            }
-            : {}),
-        ...(count !== undefined ? { _count: count } : {}),
-        ...(sort ? { _sort: sort } : {}),
-        ...(elements ? { _elements: Array.isArray(elements) ? elements.join(",") : elements } : {}),
-    }), [codes, count, elements, id, patientId, period === null || period === void 0 ? void 0 : period.end, period === null || period === void 0 ? void 0 : period.start, sort]);
+    const query = React.useMemo(() => [
+        ...(codes ? [["code", codes]] : []),
+        ...(patientId ? [["subject", `Patient/${patientId}`]] : []),
+        ...(id ? [["_id", id]] : []),
+        ...((period === null || period === void 0 ? void 0 : period.start) ? [["date", `ge${period.start.toISOString()}`]] : []),
+        ...((period === null || period === void 0 ? void 0 : period.end) ? [["date", `le${period.end.toISOString()}`]] : []),
+        ...(count !== undefined ? [["_count", String(count)]] : []),
+        ...(sort ? [["_sort", sort]] : []),
+        ...(elements
+            ? [["_elements", typeof elements === "string" ? elements : elements.join(",")]]
+            : []),
+    ], [codes, count, elements, id, patientId, period === null || period === void 0 ? void 0 : period.end, period === null || period === void 0 ? void 0 : period.start, sort]);
     const client = (0, index_1.useClient)();
     const load = React.useCallback(() => client.searchResources("Observation", query), [client, query]);
     const { data: observations = [], reload: refetch, loading, error } = (0, api_hooks_1.useOvokRequest)(load);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ovok/core",
-  "version": "0.4.26",
+  "version": "0.4.27",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",