@medplum/core 1.0.4 → 1.0.5

package/dist/esm/client.d.ts

@@ -181,6 +181,7 @@ export interface GoogleLoginRequest extends BaseLoginRequest {
 }
 export interface LoginAuthenticationResponse {
     readonly login: string;
+    readonly mfaRequired?: boolean;
     readonly code?: string;
     readonly memberships?: ProjectMembership[];
 }

package/dist/esm/client.js

@@ -10,8 +10,8 @@ import { createReference, arrayBufferToBase64 } from './utils.js';
 
 // PKCE auth based on:
 // https://aws.amazon.com/blogs/security/how-to-add-authentication-single-page-web-application-with-amazon-cognito-oauth2-implementation/
-var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_clientId, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
-const MEDPLUM_VERSION = "1.0.4-6dbdb7f6";
+var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+const MEDPLUM_VERSION = "1.0.5-53328b63";
 const DEFAULT_BASE_URL = 'https://api.medplum.com/';
 const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
 const DEFAULT_CACHE_TIME = 60000; // 60 seconds
@@ -81,11 +81,12 @@ class MedplumClient extends EventTarget {
         _MedplumClient_requestCache.set(this, void 0);
         _MedplumClient_cacheTime.set(this, void 0);
         _MedplumClient_baseUrl.set(this, void 0);
-        _MedplumClient_clientId.set(this, void 0);
         _MedplumClient_authorizeUrl.set(this, void 0);
         _MedplumClient_tokenUrl.set(this, void 0);
         _MedplumClient_logoutUrl.set(this, void 0);
         _MedplumClient_onUnauthenticated.set(this, void 0);
+        _MedplumClient_clientId.set(this, void 0);
+        _MedplumClient_clientSecret.set(this, void 0);
         _MedplumClient_accessToken.set(this, void 0);
         _MedplumClient_refreshToken.set(this, void 0);
         _MedplumClient_refreshPromise.set(this, void 0);
@@ -1365,6 +1366,8 @@ class MedplumClient extends EventTarget {
      */
     startClientLogin(clientId, clientSecret) {
         return __awaiter(this, void 0, void 0, function* () {
+            __classPrivateFieldSet(this, _MedplumClient_clientId, clientId, "f");
+            __classPrivateFieldSet(this, _MedplumClient_clientSecret, clientSecret, "f");
             const formBody = new URLSearchParams();
             formBody.set('grant_type', 'client_credentials');
             formBody.set('client_id', clientId);
@@ -1373,7 +1376,7 @@ class MedplumClient extends EventTarget {
         });
     }
 }
-_MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
+_MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_clientSecret = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
     const logins = this.getLogins().filter((login) => { var _a, _b; return ((_a = login.profile) === null || _a === void 0 ? void 0 : _a.reference) !== ((_b = newLogin.profile) === null || _b === void 0 ? void 0 : _b.reference); });
     logins.push(newLogin);
     __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('logins', logins);
@@ -1465,17 +1468,14 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(),
         options.body = JSON.stringify(data);
     }
 }, _MedplumClient_handleUnauthenticated = function _MedplumClient_handleUnauthenticated(method, url, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)
-            .then(() => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options))
-            .catch((error) => {
-            this.clear();
-            if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
-                __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
-            }
-            return Promise.reject(error);
-        });
-    });
+    if (__classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)) {
+        return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options);
+    }
+    this.clear();
+    if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
+        __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
+    }
+    return Promise.reject(new Error('Unauthenticated'));
 }, _MedplumClient_requestAuthorization = function _MedplumClient_requestAuthorization() {
     return __awaiter(this, void 0, void 0, function* () {
         yield this.startPkce();
@@ -1489,21 +1489,22 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(),
         window.location.assign(url.toString());
     });
 }, _MedplumClient_refresh = function _MedplumClient_refresh() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-            return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-        }
-        if (!__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
-            this.clear();
-            throw new Error('Invalid refresh token');
-        }
+    if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
+        return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+    }
+    if (__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
         const formBody = new URLSearchParams();
         formBody.set('grant_type', 'refresh_token');
         formBody.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
         formBody.set('refresh_token', __classPrivateFieldGet(this, _MedplumClient_refreshToken, "f"));
         __classPrivateFieldSet(this, _MedplumClient_refreshPromise, __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody), "f");
-        yield __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-    });
+        return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+    }
+    if (__classPrivateFieldGet(this, _MedplumClient_clientId, "f") && __classPrivateFieldGet(this, _MedplumClient_clientSecret, "f")) {
+        __classPrivateFieldSet(this, _MedplumClient_refreshPromise, this.startClientLogin(__classPrivateFieldGet(this, _MedplumClient_clientId, "f"), __classPrivateFieldGet(this, _MedplumClient_clientSecret, "f")), "f");
+        return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+    }
+    return undefined;
 }, _MedplumClient_fetchTokens = function _MedplumClient_fetchTokens(formBody) {
     return __awaiter(this, void 0, void 0, function* () {
         return __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, __classPrivateFieldGet(this, _MedplumClient_tokenUrl, "f"), {