@overmap-ai/core 1.0.49-fix-error-messaging.2 → 1.0.49-fix-error-messaging.4

package/dist/overmap-core.umd.cjs

@@ -208,50 +208,60 @@ var __publicField = (obj, key, value) => {
       this.requestAttemptCounter[uuid2] = (this.requestAttemptCounter[uuid2] || 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") {
-        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") {
-              if (key === "non_field_errors")
-                return value;
-              return `${key}: ${value}`;
-            }
-            if (Array.isArray(value)) {
-              if (key === "non_field_errors")
-                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);
+        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")
-        return errorRes.body;
+      } else if (typeof errorRes.body === "string") {
+        ret = errorRes.body;
+      }
     } else if (errorRes == null ? void 0 : errorRes.text) {
-      return errorRes.text;
+      ret = errorRes.text;
     } else if (err instanceof Error) {
-      return err.message;
+      ret = err.message;
     }
-    return void 0;
+    if (!ret || ret.length > MAX_ERROR_MESSAGE_LENGTH) {
+      return UNKNOWN_ERROR_MESSAGE;
+    }
+    return ret;
   }
   class APIError extends Error {
     constructor(options) {
-      const unknownMessage = "An unknown error occurred";
-      super(unknownMessage);
+      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, "response");
       __publicField(this, "message");
       __publicField(this, "options");
       const { response, innerError } = options;
-      this.message = options.message ?? extractErrorMessage(response, innerError) ?? unknownMessage;
+      this.message = options.message ?? extractErrorMessage(response, innerError) ?? UNKNOWN_ERROR_MESSAGE;
       this.status = (response == null ? void 0 : response.status) ?? 0;
       this.response = response;
       options.discard = options.discard ?? false;
@@ -4313,10 +4323,20 @@ var __publicField = (obj, key, value) => {
             innerError: error2
           });
         }
-        console.debug("Forbidden; renewing tokens and retrying.");
-        await client.auth.renewTokens();
-        console.debug("Successfully renewed tokens; retrying request.");
-        return requestToSend.query(queryParams);
+        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
+          });
+        }
       }
       throw new APIError({ response: errorResponse, innerError: error2, discard: discardStatuses.includes(status) });
     }
@@ -5138,6 +5158,7 @@ var __publicField = (obj, key, value) => {
           url: "/api/token/",
           payload: credentials,
           isAuthNeeded: false,
+          checkAuth: false,
           blockers: [],
           blocks: []
         }).then(parseTokens).catch((e) => {