@overmap-ai/core 1.0.35-debug-file.1 → 1.0.35-fix-token-refresh-loop.1

package/dist/overmap-core.js

@@ -3465,6 +3465,19 @@ function extractErrorMessage(errorRes, err) {
         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) {
@@ -3883,7 +3896,6 @@ class AttachmentService extends BaseApiService {
       throw new Error(`Attachment ${attachmentId} not found`);
     let oldFile = void 0;
     const newSha1 = await hashFile(newFile);
-    console.log(attachment, newFile);
     const performRequest2 = async () => {
       oldFile = await this.client.files.fetchCache(attachment.file_sha1);
       if (!oldFile) {
@@ -3898,13 +3910,12 @@ class AttachmentService extends BaseApiService {
         store.dispatch(updateAttachment(attachment));
         throw e;
       });
-      console.log(fileProps);
       const promise2 = this.enqueueRequest({
         description: "Edit attachment",
         method: HttpMethod.PATCH,
         url: `/attachments/${attachment.offline_id}/`,
         isResponseBlob: false,
-        payload: { ...fileProps, file_type: newFile.type },
+        payload: fileProps,
         blockers: [attachmentId, newSha1],
         blocks: [attachmentId, newSha1]
       });
@@ -3930,7 +3941,6 @@ class AttachmentService extends BaseApiService {
       file_sha1: newSha1,
       file: URL.createObjectURL(newFile)
     };
-    console.log(offlineAttachment);
     const promise = performRequest2();
     return [offlineAttachment, promise];
   }
@@ -4008,7 +4018,7 @@ class AuthService extends BaseApiService {
      * @returns {Promise<TokenPair>} The new access and refresh tokens
      */
     __publicField(this, "_getRenewedTokens", async (refreshToken) => {
-      const response = await this.enqueueRequest({
+      const promise = this.enqueueRequest({
         description: "Get renewed tokens",
         method: HttpMethod.POST,
         url: "/api/token/refresh/",
@@ -4021,6 +4031,14 @@ class AuthService extends BaseApiService {
         // Don't wait for other requests to finish, or we might end up in a deadlock.
         immediate: true
       });
+      let response = void 0;
+      try {
+        response = await promise;
+      } catch (e) {
+        await this.logout();
+      }
+      if (!response)
+        throw new Error("No response");
       if (!response.access)
         throw new Error("Missing access token");
       if (!response.refresh)