Support storage.googleapis.com in refFromUrl (#2758)

Author: schmidt-sebastian

packages/storage/src/implementation/location.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,23 +76,42 @@ export class Location {
       }
     }
     const gsPath = '(/(.*))?$';
-    const path = '(/([^?#]*).*)?$';
     const gsRegex = new RegExp('^gs://' + bucketDomain + gsPath, 'i');
     const gsIndices = { bucket: 1, path: 3 };
 
     function httpModify(loc: Location): void {
       loc.path_ = decodeURIComponent(loc.path);
     }
     const version = 'v[A-Za-z0-9_]+';
-    const hostRegex = DEFAULT_HOST.replace(/[.]/g, '\\.');
-    const httpRegex = new RegExp(
-      `^https?://${hostRegex}/${version}/b/${bucketDomain}/o${path}`,
+    const firebaseStorageHost = DEFAULT_HOST.replace(/[.]/g, '\\.');
+    const firebaseStoragePath = '(/([^?#]*).*)?$';
+    const firebaseStorageRegExp = new RegExp(
+      `^https?://${firebaseStorageHost}/${version}/b/${bucketDomain}/o${firebaseStoragePath}`,
       'i'
     );
-    const httpIndices = { bucket: 1, path: 3 };
+    const firebaseStorageIndices = { bucket: 1, path: 3 };
+
+    const cloudStorageHost =
+      '(?:storage.googleapis.com|storage.cloud.google.com)';
+    const cloudStoragePath = '([^?#]*)';
+    const cloudStorageRegExp = new RegExp(
+      `^https?://${cloudStorageHost}/${bucketDomain}/${cloudStoragePath}`,
+      'i'
+    );
+    const cloudStorageIndices = { bucket: 1, path: 2 };
+
     const groups = [
       { regex: gsRegex, indices: gsIndices, postModify: gsModify },
-      { regex: httpRegex, indices: httpIndices, postModify: httpModify }
+      {
+        regex: firebaseStorageRegExp,
+        indices: firebaseStorageIndices,
+        postModify: httpModify
+      },
+      {
+        regex: cloudStorageRegExp,
+        indices: cloudStorageIndices,
+        postModify: httpModify
+      }
     ];
     for (let i = 0; i < groups.length; i++) {
       const group = groups[i];

packages/storage/test/service.test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -182,6 +182,31 @@ describe('Firebase Storage > Service', () => {
       );
       assert.equal(ref.toString(), 'gs://mybucket/child/path/image.png');
     });
+    it('Works with storage.googleapis.com URLs', () => {
+      const ref = service.refFromURL(
+        `https://storage.googleapis.com/mybucket/path%20with%20space/image.png`
+      );
+      assert.equal(ref.toString(), 'gs://mybucket/path with space/image.png');
+    });
+    it('Works with storage.googleapis.com URLs with query params', () => {
+      const ref = service.refFromURL(
+        `https://storage.googleapis.com/mybucket/path%20with%20space/image.png?X-Goog-Algorithm=
+GOOG4-RSA-SHA256`
+      );
+      assert.equal(ref.toString(), 'gs://mybucket/path with space/image.png');
+    });
+    it('Works with storage.cloud.google.com URLs', () => {
+      const ref = service.refFromURL(
+        `https://storage.cloud.google.com/mybucket/path%20with%20space/image.png`
+      );
+      assert.equal(ref.toString(), 'gs://mybucket/path with space/image.png');
+    });
+    it('Works with storage.cloud.google.com URLs and escaped slash', () => {
+      const ref = service.refFromURL(
+        `https://storage.cloud.google.com/mybucket/path%20with%20space%2Fimage.png`
+      );
+      assert.equal(ref.toString(), 'gs://mybucket/path with space/image.png');
+    });
   });
   describe('Argument verification', () => {
     const service = new Service(