@overmap-ai/core 1.0.65-error-message-fix.2 → 1.0.65-error-message-fix.4

package/dist/overmap-core.js

@@ -241,9 +241,9 @@ function extractErrorMessage(errorRes, err) {
       } else if (typeof responseBody.message === "string") {
         console.debug("body.message is string", responseBody.message);
         ret = responseBody.message;
-      } else if (responseBody.body) {
+      } else {
         try {
-          ret = Object.entries(responseBody.body).map(([key, value]) => {
+          ret = Object.entries(responseBody).map(([key, value]) => {
             if (typeof value === "string") {
               if (_SPECIAL_KEYS.includes(key))
                 return value;
@@ -4068,7 +4068,6 @@ class JWTService extends BaseAuthService {
   }
   async initAuth(payload) {
     const uuid = v4();
-    console.debug(this.constructor.name, "Initiating auth");
     const promise = this.enqueueRequest({
       uuid,
       description: "Get token pair",
@@ -4079,23 +4078,19 @@ class JWTService extends BaseAuthService {
       checkAuth: false,
       blockers: [],
       blocks: []
-    }).then(parseTokens);
-    const timeout = 5;
+    });
+    const timeout = 10;
     let timedOut = false;
-    const timeoutPromise = new Promise((_, reject) => {
-      setTimeout(() => {
-        timedOut = true;
-        this.dispatch(markForDeletion(uuid));
-        reject(new APIError({ message: `Request timed out after ${timeout} seconds` }));
-      }, timeout * 1e3);
-    });
-    const successPromise = promise.then((tokens) => {
+    setTimeout(() => {
+      timedOut = true;
+      this.dispatch(markForDeletion(uuid));
+    }, timeout * 1e3);
+    return promise.then((tokens) => {
       if (timedOut) {
         return void 0;
       }
-      this.setTokens(tokens);
+      this.setTokens(parseTokens(tokens));
     });
-    return Promise.race([timeoutPromise, successPromise]);
   }
 }
 class BaseApiService extends BaseService {