@overmap-ai/core 1.0.49-fix-error-messaging.1 → 1.0.49-fix-error-messaging.3

package/dist/overmap-core.umd.cjs

@@ -4313,10 +4313,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) });
     }
@@ -5131,24 +5141,23 @@ var __publicField = (obj, key, value) => {
        */
       __publicField(this, "_getTokenPair", (credentials, logoutOnFailure = true) => {
         const uuid$1 = uuid.v4();
-        try {
-          const responsePromise = this.enqueueRequest({
-            uuid: uuid$1,
-            description: "Get token pair",
-            method: HttpMethod.POST,
-            url: "/api/token/",
-            payload: credentials,
-            isAuthNeeded: false,
-            blockers: [],
-            blocks: []
-          });
-          return [responsePromise.then(parseTokens), uuid$1];
-        } catch (e) {
+        const responsePromise = this.enqueueRequest({
+          uuid: uuid$1,
+          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$1];
       });
       /**
        * Takes refresh token and gets a new token pair
@@ -5209,7 +5218,7 @@ var __publicField = (obj, key, value) => {
           timedOut = true;
           store.dispatch(markForDeletion(uuid$1));
           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) => {