Make param required

Author: maneesht

packages/storage/src/implementation/connection.ts

@@ -42,9 +42,9 @@ export interface Connection<T extends ConnectionType> {
   send(
     url: string,
     method: string,
+    isUsingEmulator: boolean,
     body?: ArrayBufferView | Blob | string | null,
-    headers?: Headers,
-    isUsingEmulator?: boolean
+    headers?: Headers
   ): Promise<void>;
 
   getErrorCode(): ErrorCode;

packages/storage/src/platform/node/connection.ts

@@ -49,9 +49,9 @@ abstract class FetchConnection<T extends ConnectionType>
   async send(
     url: string,
     method: string,
+    isUsingEmulator: boolean,
     body?: NodeJS.ArrayBufferView | Blob | string,
-    headers?: Record<string, string>,
-    isUsingEmulator?: boolean
+    headers?: Record<string, string>
   ): Promise<void> {
     if (this.sent_) {
       throw internalError('cannot .send() more than once');
@@ -62,9 +62,9 @@ abstract class FetchConnection<T extends ConnectionType>
       const response = await newFetch(
         url,
         method,
+        isUsingEmulator,
         headers,
-        body,
-        isUsingEmulator
+        body
       );
       this.headers_ = response.headers;
       this.statusCode_ = response.status;
@@ -156,9 +156,9 @@ export class FetchStreamConnection extends FetchConnection<
   async send(
     url: string,
     method: string,
+    isUsingEmulator: boolean,
     body?: NodeJS.ArrayBufferView | Blob | string,
-    headers?: Record<string, string>,
-    isUsingEmulator?: boolean
+    headers?: Record<string, string>
   ): Promise<void> {
     if (this.sent_) {
       throw internalError('cannot .send() more than once');
@@ -169,9 +169,9 @@ export class FetchStreamConnection extends FetchConnection<
       const response = await newFetch(
         url,
         method,
+        isUsingEmulator,
         headers,
-        body,
-        isUsingEmulator
+        body
       );
       this.headers_ = response.headers;
       this.statusCode_ = response.status;
@@ -196,9 +196,9 @@ export class FetchStreamConnection extends FetchConnection<
 function newFetch(
   url: string,
   method: string,
+  isUsingEmulator: boolean,
   headers?: Record<string, string>,
-  body?: NodeJS.ArrayBufferView | Blob | string,
-  isUsingEmulator?: boolean
+  body?: NodeJS.ArrayBufferView | Blob | string
 ): Promise<Response> {
   const fetchArgs: RequestInit = {
     method,

packages/storage/src/service.ts

@@ -146,6 +146,7 @@ export function connectStorageEmulator(
 ): void {
   storage.host = `${host}:${port}`;
   const useSsl = isCloudWorkstation(host);
+  storage._isUsingEmulator = true;
   storage._protocol = useSsl ? 'https' : 'http';
   const { mockUserToken } = options;
   if (mockUserToken) {
@@ -193,7 +194,7 @@ export class FirebaseStorageImpl implements FirebaseStorage {
      */
     readonly _url?: string,
     readonly _firebaseVersion?: string,
-    readonly _isUsingEmulator = false
+    public _isUsingEmulator = false
   ) {
     this._maxOperationRetryTime = DEFAULT_MAX_OPERATION_RETRY_TIME;
     this._maxUploadRetryTime = DEFAULT_MAX_UPLOAD_RETRY_TIME;

packages/storage/test/node/connection.test.ts

@@ -25,7 +25,7 @@ describe('Connections', () => {
     const connection = new FetchBytesConnection();
 
     const fetchStub = stub(globalThis, 'fetch').rejects();
-    await connection.send('testurl', 'GET');
+    await connection.send('testurl', 'GET', false);
     expect(connection.getErrorCode()).to.equal(ErrorCode.NETWORK_ERROR);
     fetchStub.restore();
   });

packages/storage/test/unit/connection.ts

@@ -60,6 +60,7 @@ export class TestingConnection implements Connection<string> {
   send(
     url: string,
     method: string,
+    _isUsingEmulator: boolean,
     body?: ArrayBufferView | Blob | string | null,
     headers?: Headers
   ): Promise<void> {

packages/storage/test/unit/service.test.ts

@@ -287,9 +287,9 @@ GOOG4-RSA-SHA256`
       textConnection.send(
         'http://something.cloudworkstations.dev',
         'POST',
+        true,
         undefined,
-        undefined,
-        true
+        undefined
       );
       expect(stub).to.have.been.called;
       expect(stub).to.have.been.calledWithMatch(