Fix Storage Emulator crash on iOS 403

firebase · Feb 22, 2022 · 32c7764 · 32c7764
1 parent 0d943fb
commit 32c7764
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/scripts/storage-emulator-integration/tests.ts b/scripts/storage-emulator-integration/tests.ts
@@ -1341,6 +1341,36 @@ describe("Storage emulator", () => {
           })
           .expect(200);
       });
+
+      it("#uploadResumableHandlesAuthError", async () => {
+        const uploadURL = await supertest(STORAGE_EMULATOR_HOST)
+          .post(
+            `/v0/b/${storageBucket}/o/test_upload.jpg?uploadType=resumable&name=test_upload.jpg`
+          )
+          .set({
+            // Authorization missing
+            "X-Goog-Upload-Protocol": "resumable",
+            "X-Goog-Upload-Command": "start",
+          })
+          .expect(200)
+          .then((res) => new URL(res.header["x-goog-upload-url"]));
+
+        await supertest(STORAGE_EMULATOR_HOST)
+          .put(uploadURL.pathname + uploadURL.search)
+          .set({
+            "X-Goog-Upload-Protocol": "resumable",
+            "X-Goog-Upload-Command": "upload, finalize",
+          })
+          .expect(403);
+
+        await supertest(STORAGE_EMULATOR_HOST)
+          .put(uploadURL.pathname + uploadURL.search)
+          .set({
+            "X-Goog-Upload-Protocol": "resumable",
+            "X-Goog-Upload-Command": "cancel",
+          })
+          .expect(200);
+      });
     });
 
     after(async function (this) {

diff --git a/src/emulator/storage/files.ts b/src/emulator/storage/files.ts
@@ -221,8 +221,12 @@ export class StorageLayer {
     if (!upload) {
       return undefined;
     }
+
+    if (upload.status !== UploadStatus.FINISHED) {
+      this._persistence.deleteFile(upload.fileLocation);
+    }
     upload.status = UploadStatus.CANCELLED;
-    this._persistence.deleteFile(upload.fileLocation);
+    return upload;
   }
 
   public uploadBytes(uploadId: string, bytes: Buffer): ResumableUpload | undefined {