Modify to actually support GCS format

Author: schmidt-sebastian

packages/storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/storage",
-  "version": "0.3.29",
+  "version": "0.3.30",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -22,8 +22,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@firebase/storage-types": "0.3.11",
-    "@firebase/util": "0.2.42",
-    "@firebase/component": "0.1.7",
+    "@firebase/util": "0.2.43",
+    "@firebase/component": "0.1.8",
     "tslib": "1.11.1"
   },
   "peerDependencies": {

packages/storage/src/implementation/location.ts

@@ -20,6 +20,7 @@
  * object location.
  */
 import * as errorsExports from './error';
+import { DEFAULT_HOST } from './constants';
 
 /**
  * @struct
@@ -75,23 +76,41 @@ 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 = "(?:firebase)?storage.googleapis.com";
-    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';
+    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

@@ -184,10 +184,16 @@ describe('Firebase Storage > Service', () => {
     });
     it('Works with storage.googleapis.com URLs', () => {
       const ref = service.refFromURL(
-        `http://storage.googleapis.com/v0/b/` +
-        'mybucket/o/child%2Fpath%2Fimage.png?downloadToken=hello'
+        `https://storage.googleapis.com/mybucket/path%20with%20space/image.png`
       );
-      assert.equal(ref.toString(), 'gs://mybucket/child/path/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');
     });
   });
   describe('Argument verification', () => {