Validated whether connector information is passed in correctly

Author: maneesht

packages/data-connect/package.json

@@ -38,6 +38,7 @@
     "test:all": "npm run test:node",
     "test:browser": "karma start --single-run",
     "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
+    "test:unit": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/unit/**/*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
     "test:emulator": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/dataconnect-test-runner.ts",
     "api-report": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package data-connect --packageRoot . --typescriptDts ./dist/src/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/public.d.ts && yarn api-report:api-json",
     "api-report:api-json": "rm -rf temp && api-extractor run --local --verbose",

packages/data-connect/src/api/DataConnect.ts

@@ -210,7 +210,7 @@ export function getDataConnect(
     app = appOrOptions;
   }
 
-  if (!app) {
+  if (!app || Object.keys(app).length === 0) {
     app = getApp();
   }
   const provider = _getProvider(app, 'data-connect');
@@ -224,9 +224,8 @@ export function getDataConnect(
       return dcInstance;
     }
   }
-  if (!dcOptions) {
-    throw new DataConnectError(Code.INVALID_ARGUMENT, 'DC Option Required');
-  }
+  validateDCOptions(dcOptions);
+  
   logDebug('Creating new DataConnect instance');
   // Initialize with options.
   return provider.initialize({
@@ -235,6 +234,19 @@ export function getDataConnect(
   });
 }
 
+export function validateDCOptions(dcOptions: ConnectorConfig) {
+  const fields = ['connector', 'location', 'service'];
+  if (!dcOptions) {
+    throw new DataConnectError(Code.INVALID_ARGUMENT, 'DC Option Required');
+  }
+  fields.forEach(field => {
+    if (dcOptions[field] === null || dcOptions[field] === undefined) {
+      throw new DataConnectError(Code.INVALID_ARGUMENT, `${field} Required`);
+    }
+  });
+  return true;
+}
+
 /**
  * Delete DataConnect instance
  * @param dataConnect DataConnect instance

packages/data-connect/src/register.ts

@@ -26,6 +26,7 @@ import { name, version } from '../package.json';
 import { setSDKVersion } from '../src/core/version';
 
 import { DataConnect, ConnectorConfig } from './api/DataConnect';
+import { Code, DataConnectError } from './core/error';
 
 export function registerDataConnect(variant?: string): void {
   setSDKVersion(SDK_VERSION);
@@ -39,6 +40,9 @@ export function registerDataConnect(variant?: string): void {
         if (settings) {
           newOpts = JSON.parse(settings);
         }
+        if(!app.options.projectId) {
+          throw new DataConnectError(Code.INVALID_ARGUMENT, "Project ID must be provided. Did you pass in a proper projectId to initializeApp?");
+        }
         return new DataConnect(
           app,
           { ...newOpts, projectId: app.options.projectId! },

packages/data-connect/test/unit/dataconnect.test.ts

@@ -0,0 +1,25 @@
+import { deleteApp, initializeApp } from "@firebase/app";
+import { ConnectorConfig, getDataConnect } from "../../src";
+import { expect } from "chai";
+
+describe('Data Connect Test', () => {
+    it('should throw an error if `projectId` is not provided', () => {
+        const app = initializeApp({});
+        expect(() => getDataConnect({ connector: 'c', location: 'l', service: 's'})).to.throw('Project ID must be provided. Did you pass in a proper projectId to initializeApp?');
+        deleteApp(app);
+    });
+    it('should not throw an error if `projectId` is provided', () => {
+        const projectId = 'p';
+        initializeApp({ projectId});
+        expect(() => getDataConnect({ connector: 'c', location: 'l', service: 's'})).to.not.throw('Project ID must be provided. Did you pass in a proper projectId to initializeApp?');
+        const dc = getDataConnect({ connector: 'c', location: 'l', service: 's'});
+        expect(dc.app.options.projectId).to.eq(projectId);
+    });
+    it('should throw an error if `connectorConfig` is not provided', () => {
+        const projectId = 'p';
+        initializeApp({ projectId});
+        expect(() => getDataConnect({ } as ConnectorConfig)).to.throw('DC Option Required');
+        const dc = getDataConnect({ connector: 'c', location: 'l', service: 's'});
+        expect(dc.app.options.projectId).to.eq(projectId);
+    });
+});