@ovok/core 0.3.2 → 0.3.3

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

@@ -12,18 +12,21 @@ async function login(body) {
         body,
         codeChallenge,
     });
-    const tenantCode = (0, handle_tenant_code_1.handleTenantCode)({
-        profiles: startResponse.profiles,
-        tenantCode: body.tenantCode,
-        type: body.type,
-    });
-    if (!tenantCode) {
-        throw new Error("No tenant code found");
-    }
     if (startResponse.nextStep === "mfa") {
         return {
             nextStep: "mfa",
             verify: async (code) => {
+                const tenantCode = body.type === "Practitioner" && !startResponse.profiles
+                    ? body.tenantCode
+                    : (0, handle_tenant_code_1.handleTenantCode)({
+                        profiles: startResponse.profiles,
+                        tenantCode: body.tenantCode,
+                        type: body.type,
+                    });
+                const practitionerTenantCode = tenantCode;
+                if (body.type === "Practitioner" && !practitionerTenantCode) {
+                    throw new Error("No tenant code found");
+                }
                 const mfaResponse = await this.post(`auth/tenant/${body.type}/login/mfa`, {
                     loginId: startResponse.loginId,
                     mfaToken: code,
@@ -34,7 +37,7 @@ async function login(body) {
                         type: "Practitioner",
                         sessionCode: mfaResponse.sessionCode,
                         codeVerifier,
-                        tenantCode,
+                        tenantCode: practitionerTenantCode,
                     });
                 }
                 return (0, exchange_code_1.exchangeCode)({
@@ -46,6 +49,14 @@ async function login(body) {
             },
         };
     }
+    const tenantCode = (0, handle_tenant_code_1.handleTenantCode)({
+        profiles: startResponse.profiles,
+        tenantCode: body.tenantCode,
+        type: body.type,
+    });
+    if (!tenantCode) {
+        throw new Error("No tenant code found");
+    }
     const exchangeCodeProps = body.type === "Practitioner"
         ? {
             client: this,

package/dist/client/auth/types/Session.d.ts

@@ -2,11 +2,8 @@
 export interface OvokSession {
     id: string;
     authMethod?: string;
-    ip?: string;
-    browser?: string;
-    os?: string;
-    createdAt?: string;
-    lastActiveAt?: string;
+    remoteAddress?: string;
+    lastUpdated?: string;
 }
 /** Session selector accepted by the session revocation endpoint. */
 export type SessionRevokeOption = "current" | "other" | "all" | (string & {});

package/dist/client/errors/rate-limit-error.js

@@ -4,6 +4,7 @@ exports.RateLimitError = void 0;
 exports.isRateLimitError = isRateLimitError;
 exports.mapRateLimitError = mapRateLimitError;
 const core_1 = require("@medplum/core");
+const RATE_LIMIT_RESET_EXTENSION_URL = "https://medplum.com/fhir/StructureDefinition/rate-limit-reset";
 /** A typed error returned when the server asks the client to slow down. */
 class RateLimitError extends Error {
     constructor(retryAfterMs, options) {
@@ -31,10 +32,33 @@ function mapRateLimitError(error) {
         return error;
     }
     if (error instanceof core_1.OperationOutcomeError && isRateLimitOutcome(error.outcome)) {
-        return new RateLimitError((0, core_1.getRateLimitReset)(error.outcome), { cause: error });
+        return new RateLimitError(rateLimitResetFromOutcome(error.outcome), { cause: error });
     }
     return error;
 }
+function rateLimitResetFromOutcome(outcome) {
+    var _a, _b, _c;
+    if (!outcome || typeof outcome !== "object") {
+        return undefined;
+    }
+    const record = outcome;
+    const extension = (_a = record.extension) === null || _a === void 0 ? void 0 : _a.find((candidate) => candidate.url === RATE_LIMIT_RESET_EXTENSION_URL);
+    if (typeof (extension === null || extension === void 0 ? void 0 : extension.valueUnsignedInt) === "number") {
+        return extension.valueUnsignedInt * 1000;
+    }
+    for (const issue of (_b = record.issue) !== null && _b !== void 0 ? _b : []) {
+        try {
+            const diagnostics = JSON.parse((_c = issue.diagnostics) !== null && _c !== void 0 ? _c : "");
+            if (typeof diagnostics.msBeforeNext === "number") {
+                return diagnostics.msBeforeNext;
+            }
+        }
+        catch (_d) {
+            // Diagnostics are optional and may be ordinary human-readable text.
+        }
+    }
+    return undefined;
+}
 function isRateLimitOutcome(outcome) {
     if (!(0, core_1.isOperationOutcome)(outcome)) {
         return false;

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.3.1",
+        version: "0.3.2",
     },
     fhirVersion: "4.0.1",
     format: ["json"],

package/package.json

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