@overmap-ai/core 1.0.50-document-attachments.2 → 1.0.50

package/README.md

@@ -1,4 +1,4 @@
-# @overmap-ai/core
-
-The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
-packages.
+# @overmap-ai/core
+
+The `core` package contains core functionality for the Overmap platform. It is a peer dependency of all other overmap
+packages.

package/dist/overmap-core.js

@@ -217,18 +217,64 @@ class OutboxCoordinator {
     this.requestAttemptCounter[uuid] = (this.requestAttemptCounter[uuid] || 0) + 1;
   }
 }
+const UNKNOWN_ERROR_MESSAGE = "An unknown error occurred";
+const MAX_ERROR_MESSAGE_LENGTH = 500;
+const _SPECIAL_KEYS = ["non_field_errors", "detail"];
+function extractErrorMessage(errorRes, err) {
+  let ret;
+  if (errorRes == null ? void 0 : errorRes.body) {
+    if (typeof errorRes.body === "object") {
+      const responseBody = errorRes.body;
+      if (typeof responseBody.error === "string") {
+        ret = responseBody.error;
+      } else if (typeof responseBody.message === "string") {
+        ret = responseBody.message;
+      } else if (responseBody.body) {
+        try {
+          ret = Object.entries(responseBody.body).map(([key, value]) => {
+            if (typeof value === "string") {
+              if (_SPECIAL_KEYS.includes(key))
+                return value;
+              return `${key}: ${value}`;
+            }
+            if (Array.isArray(value)) {
+              if (_SPECIAL_KEYS.includes(key))
+                return value.join("\n");
+              return value.map((v) => `${key}: ${v}`).join("\n");
+            }
+            return `${key}: ${JSON.stringify(value)}`;
+          }).join("\n");
+        } catch (e) {
+          console.error("Failed to extract error message from response body", e);
+        }
+      }
+    } else if (typeof errorRes.body === "string") {
+      ret = errorRes.body;
+    }
+  } else if (errorRes == null ? void 0 : errorRes.text) {
+    ret = errorRes.text;
+  } else if (err instanceof Error) {
+    ret = err.message;
+  }
+  if (!ret || ret.length > MAX_ERROR_MESSAGE_LENGTH) {
+    return UNKNOWN_ERROR_MESSAGE;
+  }
+  return ret;
+}
 class APIError extends Error {
-  constructor(message, response, options) {
-    super(response == null ? void 0 : response.text);
+  constructor(options) {
+    super(UNKNOWN_ERROR_MESSAGE);
     // NOTE: Needs to conform to NetworkError in @redux-offline/redux-offline, which has `status` and `response`.
     __publicField(this, "status");
-    __publicField(this, "message");
     __publicField(this, "response");
+    __publicField(this, "message");
     __publicField(this, "options");
-    this.message = message;
+    const { response, innerError } = options;
+    this.message = options.message ?? extractErrorMessage(response, innerError) ?? UNKNOWN_ERROR_MESSAGE;
     this.status = (response == null ? void 0 : response.status) ?? 0;
     this.response = response;
-    this.options = options ?? { discard: false };
+    options.discard = options.discard ?? false;
+    this.options = options;
   }
 }
 class DeferredPromise {
@@ -4239,35 +4285,6 @@ function extractResponseFromError(error2) {
   }
   return void 0;
 }
-function extractErrorMessage(errorRes, err) {
-  if (errorRes == null ? void 0 : errorRes.body) {
-    if (typeof errorRes.body === "object") {
-      if (typeof errorRes.body.error === "string")
-        return errorRes.body.error;
-      if (typeof errorRes.body.message === "string")
-        return errorRes.body.message;
-      try {
-        return Object.entries(errorRes.body).map(([key, value]) => {
-          if (typeof value === "string") {
-            return `${key}: ${value}`;
-          }
-          if (Array.isArray(value)) {
-            return value.map((v) => `${key}: ${v}`).join("\n");
-          }
-          return `${key}: ${JSON.stringify(value)}`;
-        }).join("\n");
-      } catch (e) {
-        console.error("Failed to extract error message from response body", e);
-      }
-    } else if (typeof errorRes.body === "string")
-      return errorRes.body;
-  } else if (errorRes == null ? void 0 : errorRes.text) {
-    return errorRes.text;
-  } else if (err instanceof Error) {
-    return err.message;
-  }
-  return void 0;
-}
 async function performRequest(action, client) {
   async function checkToken() {
     if (client.auth.tokenIsExpiringSoon()) {
@@ -4370,19 +4387,29 @@ async function performRequest(action, client) {
           console.warn("No signed-in user to sign out.");
         }
         await client.auth.logout();
-        throw new APIError("You have been signed out due to inactivity.", errorResponse, {
-          discard: true
+        throw new APIError({
+          message: "You have been signed out due to inactivity.",
+          response: errorResponse,
+          discard: true,
+          innerError: error2
+        });
+      }
+      if (state.authReducer.isLoggedIn) {
+        console.debug("Forbidden; renewing tokens and retrying.");
+        await client.auth.renewTokens();
+        console.debug("Successfully renewed tokens; retrying request.");
+        return requestToSend.query(queryParams);
+      } else {
+        console.debug("Forbidden; user is not logged in.");
+        throw new APIError({
+          message: "Incorrect username or password.",
+          response: errorResponse,
+          discard: true,
+          innerError: error2
         });
       }
-      console.debug("Forbidden; renewing tokens and retrying.");
-      await client.auth.renewTokens();
-      console.debug("Successfully renewed tokens; retrying request.");
-      return requestToSend.query(queryParams);
     }
-    const apiErrorMessage = extractErrorMessage(errorResponse, error2) || "An unexpected error occurred.";
-    throw new APIError(apiErrorMessage, errorResponse, {
-      discard: discardStatuses.includes(status)
-    });
+    throw new APIError({ response: errorResponse, innerError: error2, discard: discardStatuses.includes(status) });
   }
 }
 class MiddlewareChainerPrivate {
@@ -4593,18 +4620,29 @@ class BaseApiService {
         if (response) {
           promise.resolve(response.body);
         } else {
-          const error2 = new APIError(
-            "Could not get a response from the server.",
+          const error2 = new APIError({
+            message: "Could not get a response from the server.",
             response,
-            {
-              discard: true
-            }
-          );
+            discard: true
+          });
           promise.reject(error2);
         }
       };
       const errorHandler = (error2) => {
-        error2.options.discard = true;
+        if (error2 instanceof APIError) {
+          error2.options.discard = true;
+        } else {
+          console.error(
+            "Received an unexpected error while processing a request:",
+            error2,
+            "\nConverting error to APIError and discarding."
+          );
+          error2 = new APIError({
+            message: "An error occurred while processing the request.",
+            innerError: error2,
+            discard: true
+          });
+        }
         promise.reject(error2);
       };
       innerPromise.then(successOrUndefinedHandler, errorHandler);
@@ -5185,24 +5223,23 @@ class AuthService extends BaseApiService {
      */
     __publicField(this, "_getTokenPair", (credentials, logoutOnFailure = true) => {
       const uuid = v4();
-      try {
-        const responsePromise = this.enqueueRequest({
-          uuid,
-          description: "Get token pair",
-          method: HttpMethod.POST,
-          url: "/api/token/",
-          payload: credentials,
-          isAuthNeeded: false,
-          blockers: [],
-          blocks: []
-        });
-        return [responsePromise.then(parseTokens), uuid];
-      } catch (e) {
+      const responsePromise = this.enqueueRequest({
+        uuid,
+        description: "Get token pair",
+        method: HttpMethod.POST,
+        url: "/api/token/",
+        payload: credentials,
+        isAuthNeeded: false,
+        checkAuth: false,
+        blockers: [],
+        blocks: []
+      }).then(parseTokens).catch((e) => {
         if (logoutOnFailure) {
           void this.logout().then();
         }
         throw e;
-      }
+      });
+      return [responsePromise, uuid];
     });
     /**
      * Takes refresh token and gets a new token pair
@@ -5263,7 +5300,7 @@ class AuthService extends BaseApiService {
         timedOut = true;
         store.dispatch(markForDeletion(uuid));
         store.dispatch(markForDeletion(initialDataUuid));
-        reject(new Error(`Request timed out after ${timeout} seconds`));
+        reject(new APIError({ message: `Request timed out after ${timeout} seconds` }));
       }, timeout * 1e3);
     });
     const successPromise = promise.then((tokens) => {
@@ -7239,8 +7276,7 @@ class OrganizationAccessService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    const organizationAccesses = result;
-    store.dispatch(setOrganizationAccesses(organizationAccesses));
+    store.dispatch(setOrganizationAccesses(result));
   }
 }
 const cachedRequestPromises = {};