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

package/dist/overmap-core.js

@@ -4547,7 +4547,20 @@ class BaseApiService {
         }
       };
       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);
@@ -5127,24 +5140,22 @@ 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,
+        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
@@ -5205,7 +5216,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) => {