Fixed parsing

Author: maneesht

packages/data-connect/src/core/QueryManager.ts

@@ -221,9 +221,6 @@ export class QueryManager {
 
     return newR;
   }
-  enableEmulator(host: string, port: number): void {
-    this.transport.useEmulator(host, port);
-  }
 }
 function compareDates(str1: string, str2: string): boolean {
   const date1 = new Date(str1);

packages/data-connect/src/network/transport/rest.ts

@@ -27,7 +27,6 @@ import { CallerSdkType, CallerSdkTypeEnum, DataConnectTransport } from '.';
 
 export class RESTTransport implements DataConnectTransport {
   private _host = '';
-  private _port: number | undefined;
   private _location = 'l';
   private _connectorName = '';
   private _secure = true;
@@ -47,9 +46,6 @@ export class RESTTransport implements DataConnectTransport {
     private _callerSdkType: CallerSdkType = CallerSdkTypeEnum.Base
   ) {
     if (transportOptions) {
-      if (typeof transportOptions.port === 'number') {
-        this._port = transportOptions.port;
-      }
       if (typeof transportOptions.sslEnabled !== 'undefined') {
         this._secure = transportOptions.sslEnabled;
       }
@@ -88,14 +84,11 @@ export class RESTTransport implements DataConnectTransport {
         projectId: this._project,
         service: this._serviceName
       },
-      { host: this._host, sslEnabled: this._secure, port: this._port }
+      { host: this._host, sslEnabled: this._secure }
     );
   }
-  useEmulator(host: string, port?: number, isSecure?: boolean): void {
+  useEmulator(host: string, isSecure?: boolean): void {
     this._host = host;
-    if (typeof port === 'number') {
-      this._port = port;
-    }
     if (typeof isSecure !== 'undefined') {
       this._secure = isSecure;
     }

packages/data-connect/src/util/url.ts

@@ -16,27 +16,16 @@
  */
 
 import { DataConnectOptions, TransportOptions } from '../api/DataConnect';
-import { Code, DataConnectError } from '../core/error';
-import { logError } from '../logger';
 
 export function urlBuilder(
   projectConfig: DataConnectOptions,
   transportOptions: TransportOptions
 ): string {
   const { connector, location, projectId: project, service } = projectConfig;
-  const { host, sslEnabled, port } = transportOptions;
+  const { host, sslEnabled } = transportOptions;
   const protocol = sslEnabled ? 'https' : 'http';
   const realHost = host || `firebasedataconnect.googleapis.com`;
-  let baseUrl = `${protocol}://${realHost}`;
-  if (typeof port === 'number') {
-    baseUrl += `:${port}`;
-  } else if (typeof port !== 'undefined') {
-    logError('Port type is of an invalid type');
-    throw new DataConnectError(
-      Code.INVALID_ARGUMENT,
-      'Incorrect type for port passed in!'
-    );
-  }
+  const baseUrl = `${protocol}://${realHost}`;
   return `${baseUrl}/v1/projects/${project}/locations/${location}/services/${service}/connectors/${connector}`;
 }
 export function addToken(url: string, apiKey?: string): string {

packages/data-connect/test/dataconnect/index.esm.js

@@ -63,19 +63,16 @@ describe('Data Connect Test', () => {
   it('should parse env var correctly with http://', async () => {
     const parsedHost = parseOptions('http://localhost');
     expect(parsedHost.host).to.eq('localhost');
-    expect(parsedHost.port).to.be.undefined;
     expect(parsedHost.sslEnabled).to.be.false;
   });
   it('should parse env var correctly with port', async () => {
     const parsedHost = parseOptions('localhost:8080');
-    expect(parsedHost.host).to.eq('localhost');
-    expect(parsedHost.port).to.eq(8080);
+    expect(parsedHost.host).to.eq('localhost:8080');
     expect(parsedHost.sslEnabled).to.be.false;
   });
 it('should parse env var correctly with https://', async () => {
     const parsedHost = parseOptions('https://localhost');
     expect(parsedHost.host).to.eq('localhost');
-    expect(parsedHost.port).to.be.undefined;
     expect(parsedHost.sslEnabled).to.be.true;
   });
 });