@medplum/core 0.9.27 → 0.9.30

package/dist/esm/client.d.ts

@@ -15,7 +15,7 @@ export interface MedplumClientOptions {
     /**
      * Base server URL.
      *
-     * Default value is "https://api.medplum.com/".
+     * Default value is https://api.medplum.com/
      *
      * Use this to point to a custom Medplum deployment.
      */
@@ -145,6 +145,8 @@ export interface LoginRequest {
     readonly nonce?: string;
 }
 export interface NewUserRequest {
+    readonly firstName: string;
+    readonly lastName: string;
     readonly email: string;
     readonly password: string;
     readonly recaptchaToken: string;
@@ -153,13 +155,9 @@ export interface NewUserRequest {
 }
 export interface NewProjectRequest {
     readonly projectName: string;
-    readonly firstName: string;
-    readonly lastName: string;
 }
 export interface NewPatientRequest {
     readonly projectId: string;
-    readonly firstName: string;
-    readonly lastName: string;
 }
 export interface GoogleCredentialResponse {
     readonly clientId: string;
@@ -168,6 +166,7 @@ export interface GoogleCredentialResponse {
 export interface GoogleLoginRequest {
     readonly googleClientId: string;
     readonly googleCredential: string;
+    readonly projectId?: string;
     readonly clientId?: string;
     readonly scope?: string;
     readonly nonce?: string;
@@ -460,14 +459,14 @@ export declare class MedplumClient extends EventTarget {
      * Does not invalidate tokens with the server.
      * @category Authentication
      */
-    signOut(): Promise<void>;
+    signOut(): void;
     /**
      * Tries to sign in the user.
      * Returns true if the user is signed in.
      * This may result in navigating away to the sign in page.
      * @category Authentication
      */
-    signInWithRedirect(): Promise<ProfileResource | void> | undefined;
+    signInWithRedirect(): Promise<ProfileResource | void>;
     /**
      * Tries to sign out the user.
      * See: https://docs.aws.amazon.com/cognito/latest/developerguide/logout-endpoint.html
@@ -735,7 +734,6 @@ export declare class MedplumClient extends EventTarget {
      *
      * ```typescript
      * const result = await medplum.createResourceIfNoneExist(
-     *   'Patient?identifier=123',
      *   {
      *     resourceType: 'Patient',
      *     identifier: [{
@@ -746,14 +744,16 @@ export declare class MedplumClient extends EventTarget {
      *      family: 'Smith',
      *      given: ['John']
      *     }]
-     *   });
+     *   },
+     *   'identifier=123'
+     * );
      * console.log(result.id);
      * ```
      *
      * This method is syntactic sugar for:
      *
      * ```typescript
-     * return searchOne(query) ?? createResource(resource);
+     * return searchOne(resourceType, query) ?? createResource(resource);
      * ```
      *
      * The query parameter only contains the search parameters (what would be in the URL following the "?").
@@ -762,7 +762,7 @@ export declare class MedplumClient extends EventTarget {
      *
      * @category Create
      * @param resource The FHIR resource to create.
-     * @param query The search query for an equivalent resource.
+     * @param query The search query for an equivalent resource (should not include resource type or "?").
      * @returns The result of the create operation.
      */
     createResourceIfNoneExist<T extends Resource>(resource: T, query: string): Promise<T>;

package/dist/esm/client.js

@@ -8,13 +8,13 @@ import { ClientStorage } from './storage.js';
 import { globalSchema, indexStructureDefinition, indexSearchParameter } from './types.js';
 import { createReference, arrayBufferToBase64 } from './utils.js';
 
-// PKCE auth ased on:
+// 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_startPkce, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
 const DEFAULT_BASE_URL = 'https://api.medplum.com/';
 const DEFAULT_SCOPE = 'launch/patient openid fhirUser offline_access user/*.*';
 const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
-const DEFAULT_CACHE_TIME = 10000; // 10 seconds
+const DEFAULT_CACHE_TIME = 60000; // 60 seconds
 const JSON_CONTENT_TYPE = 'application/json';
 const FHIR_CONTENT_TYPE = 'application/fhir+json';
 const PATCH_CONTENT_TYPE = 'application/json-patch+json';
@@ -91,16 +91,13 @@ class MedplumClient extends EventTarget {
             if (!options.baseUrl.startsWith('http')) {
                 throw new Error('Base URL must start with http or https');
             }
-            if (!options.baseUrl.endsWith('/')) {
-                throw new Error('Base URL must end with a trailing slash');
-            }
         }
         __classPrivateFieldSet(this, _MedplumClient_fetch, (options === null || options === void 0 ? void 0 : options.fetch) || window.fetch.bind(window), "f");
         __classPrivateFieldSet(this, _MedplumClient_createPdf, options === null || options === void 0 ? void 0 : options.createPdf, "f");
         __classPrivateFieldSet(this, _MedplumClient_storage, new ClientStorage(), "f");
         __classPrivateFieldSet(this, _MedplumClient_requestCache, new LRUCache((_a = options === null || options === void 0 ? void 0 : options.resourceCacheSize) !== null && _a !== void 0 ? _a : DEFAULT_RESOURCE_CACHE_SIZE), "f");
         __classPrivateFieldSet(this, _MedplumClient_cacheTime, (_b = options === null || options === void 0 ? void 0 : options.cacheTime) !== null && _b !== void 0 ? _b : DEFAULT_CACHE_TIME, "f");
-        __classPrivateFieldSet(this, _MedplumClient_baseUrl, (options === null || options === void 0 ? void 0 : options.baseUrl) || DEFAULT_BASE_URL, "f");
+        __classPrivateFieldSet(this, _MedplumClient_baseUrl, ensureTrailingSlash(options === null || options === void 0 ? void 0 : options.baseUrl) || DEFAULT_BASE_URL, "f");
         __classPrivateFieldSet(this, _MedplumClient_clientId, (options === null || options === void 0 ? void 0 : options.clientId) || '', "f");
         __classPrivateFieldSet(this, _MedplumClient_authorizeUrl, (options === null || options === void 0 ? void 0 : options.authorizeUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/authorize', "f");
         __classPrivateFieldSet(this, _MedplumClient_tokenUrl, (options === null || options === void 0 ? void 0 : options.tokenUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/token', "f");
@@ -349,7 +346,6 @@ class MedplumClient extends EventTarget {
      */
     signOut() {
         this.clear();
-        return Promise.resolve();
     }
     /**
      * Tries to sign in the user.
@@ -358,15 +354,17 @@ class MedplumClient extends EventTarget {
      * @category Authentication
      */
     signInWithRedirect() {
-        const urlParams = new URLSearchParams(window.location.search);
-        const code = urlParams.get('code');
-        if (!code) {
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_requestAuthorization).call(this);
-            return undefined;
-        }
-        else {
-            return this.processCode(code);
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            const urlParams = new URLSearchParams(window.location.search);
+            const code = urlParams.get('code');
+            if (!code) {
+                yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_requestAuthorization).call(this);
+                return undefined;
+            }
+            else {
+                return this.processCode(code);
+            }
+        });
     }
     /**
      * Tries to sign out the user.
@@ -757,7 +755,6 @@ class MedplumClient extends EventTarget {
      *
      * ```typescript
      * const result = await medplum.createResourceIfNoneExist(
-     *   'Patient?identifier=123',
      *   {
      *     resourceType: 'Patient',
      *     identifier: [{
@@ -768,14 +765,16 @@ class MedplumClient extends EventTarget {
      *      family: 'Smith',
      *      given: ['John']
      *     }]
-     *   });
+     *   },
+     *   'identifier=123'
+     * );
      * console.log(result.id);
      * ```
      *
      * This method is syntactic sugar for:
      *
      * ```typescript
-     * return searchOne(query) ?? createResource(resource);
+     * return searchOne(resourceType, query) ?? createResource(resource);
      * ```
      *
      * The query parameter only contains the search parameters (what would be in the URL following the "?").
@@ -784,7 +783,7 @@ class MedplumClient extends EventTarget {
      *
      * @category Create
      * @param resource The FHIR resource to create.
-     * @param query The search query for an equivalent resource.
+     * @param query The search query for an equivalent resource (should not include resource type or "?").
      * @returns The result of the create operation.
      */
     createResourceIfNoneExist(resource, query) {
@@ -916,14 +915,19 @@ class MedplumClient extends EventTarget {
      * @returns The result of the update operation.
      */
     updateResource(resource) {
-        if (!resource.resourceType) {
-            throw new Error('Missing resourceType');
-        }
-        if (!resource.id) {
-            throw new Error('Missing id');
-        }
-        this.invalidateSearches(resource.resourceType);
-        return this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!resource.resourceType) {
+                throw new Error('Missing resourceType');
+            }
+            if (!resource.id) {
+                throw new Error('Missing id');
+            }
+            this.invalidateSearches(resource.resourceType);
+            const result = yield this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
+            // On 304 not modified, result will be undefined
+            // Return the user input instead
+            return result !== null && result !== void 0 ? result : resource;
+        });
     }
     /**
      * Updates a FHIR resource using JSONPatch operations.
@@ -1360,16 +1364,18 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(),
         __classPrivateFieldGet(this, _MedplumClient_storage, "f").setString('codeChallenge', codeChallenge);
     });
 }, _MedplumClient_requestAuthorization = function _MedplumClient_requestAuthorization() {
-    __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
-    const url = new URL(__classPrivateFieldGet(this, _MedplumClient_authorizeUrl, "f"));
-    url.searchParams.set('response_type', 'code');
-    url.searchParams.set('state', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('pkceState'));
-    url.searchParams.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
-    url.searchParams.set('redirect_uri', getBaseUrl());
-    url.searchParams.set('scope', DEFAULT_SCOPE);
-    url.searchParams.set('code_challenge_method', 'S256');
-    url.searchParams.set('code_challenge', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge'));
-    window.location.assign(url.toString());
+    return __awaiter(this, void 0, void 0, function* () {
+        yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
+        const url = new URL(__classPrivateFieldGet(this, _MedplumClient_authorizeUrl, "f"));
+        url.searchParams.set('response_type', 'code');
+        url.searchParams.set('state', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('pkceState'));
+        url.searchParams.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
+        url.searchParams.set('redirect_uri', getBaseUrl());
+        url.searchParams.set('scope', DEFAULT_SCOPE);
+        url.searchParams.set('code_challenge_method', 'S256');
+        url.searchParams.set('code_challenge', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge'));
+        window.location.assign(url.toString());
+    });
 }, _MedplumClient_refresh = function _MedplumClient_refresh() {
     return __awaiter(this, void 0, void 0, function* () {
         if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
@@ -1445,6 +1451,12 @@ _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(),
 function getBaseUrl() {
     return window.location.protocol + '//' + window.location.host + '/';
 }
+function ensureTrailingSlash(url) {
+    if (!url) {
+        return url;
+    }
+    return url.endsWith('/') ? url : url + '/';
+}
 
 export { MedplumClient };
 //# sourceMappingURL=client.js.map