Fix fallout

Author: hsubox76

packages/storage/src/implementation/location.ts

@@ -51,13 +51,10 @@ export class Location {
     return '/b/' + encode(this.bucket) + '/o';
   }
 
-  static makeFromBucketSpec(
-    bucketString: string,
-    customHost?: string
-  ): Location {
+  static makeFromBucketSpec(bucketString: string, host: string): Location {
     let bucketLocation;
     try {
-      bucketLocation = Location.makeFromUrl(bucketString, customHost);
+      bucketLocation = Location.makeFromUrl(bucketString, host);
     } catch (e) {
       // Not valid URL, use as-is. This lets you put bare bucket names in
       // config.
@@ -70,7 +67,7 @@ export class Location {
     }
   }
 
-  static makeFromUrl(url: string, customHost?: string): Location {
+  static makeFromUrl(url: string, host: string): Location {
     let location: Location | null = null;
     const bucketDomain = '([A-Za-z0-9.\\-_]+)';
 
@@ -87,10 +84,7 @@ export class Location {
       loc.path_ = decodeURIComponent(loc.path);
     }
     const version = 'v[A-Za-z0-9_]+';
-    const firebaseStorageHost = (customHost ?? DEFAULT_HOST).replace(
-      /[.]/g,
-      '\\.'
-    );
+    const firebaseStorageHost = host.replace(/[.]/g, '\\.');
     const firebaseStoragePath = '(/([^?#]*).*)?$';
     const firebaseStorageRegExp = new RegExp(
       `^https?://${firebaseStorageHost}/${version}/b/${bucketDomain}/o${firebaseStoragePath}`,
@@ -99,7 +93,9 @@ export class Location {
     const firebaseStorageIndices = { bucket: 1, path: 3 };
 
     const cloudStorageHost =
-      customHost ?? '(?:storage.googleapis.com|storage.cloud.google.com)';
+      host === DEFAULT_HOST
+        ? '(?:storage.googleapis.com|storage.cloud.google.com)'
+        : host;
     const cloudStoragePath = '([^?#]*)';
     const cloudStorageRegExp = new RegExp(
       `^https?://${cloudStorageHost}/${bucketDomain}/${cloudStoragePath}`,

packages/storage/src/service.ts

@@ -42,7 +42,6 @@ import {
 import { validateNumber } from './implementation/type';
 
 export function isUrl(path?: string): boolean {
-  console.log(path);
   return /^[A-Za-z]+:\/\//.test(path as string);
 }
 
@@ -122,14 +121,14 @@ export function ref(
 }
 
 function extractBucket(
-  config?: FirebaseOptions,
-  customHost?: string
+  host: string,
+  config?: FirebaseOptions
 ): Location | null {
   const bucketString = config?.[CONFIG_STORAGE_BUCKET_KEY];
   if (bucketString == null) {
     return null;
   }
-  return Location.makeFromBucketSpec(bucketString, customHost);
+  return Location.makeFromBucketSpec(bucketString, host);
 }
 
 export function useStorageEmulator(
@@ -168,9 +167,9 @@ export class StorageService implements _FirebaseService {
     this._maxUploadRetryTime = DEFAULT_MAX_UPLOAD_RETRY_TIME;
     this._requests = new Set();
     if (_url != null) {
-      this._bucket = Location.makeFromBucketSpec(_url);
+      this._bucket = Location.makeFromBucketSpec(_url, this._host);
     } else {
-      this._bucket = extractBucket(this.app.options);
+      this._bucket = extractBucket(this._host, this.app.options);
     }
   }
 
@@ -187,7 +186,7 @@ export class StorageService implements _FirebaseService {
     if (this._url != null) {
       this._bucket = Location.makeFromBucketSpec(this._url, origin);
     } else {
-      this._bucket = extractBucket(this.app.options, origin);
+      this._bucket = extractBucket(origin, this.app.options);
     }
   }