Do not throw error on duplicate service registration. (#2085)

Author: hsubox76

packages/app/index.ts

@@ -18,9 +18,7 @@
 import { FirebaseNamespace } from '@firebase/app-types';
 import { createFirebaseNamespace } from './src/firebaseNamespace';
 import { isNode, isBrowser } from '@firebase/util';
-import { Logger } from '@firebase/logger';
-
-const logger = new Logger('@firebase/app');
+import { logger } from './src/logger';
 
 // Firebase Lite detection
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/app/src/errors.ts

@@ -22,7 +22,6 @@ export const enum AppError {
   BAD_APP_NAME = 'bad-app-name',
   DUPLICATE_APP = 'duplicate-app',
   APP_DELETED = 'app-deleted',
-  DUPLICATE_SERVICE = 'duplicate-service',
   INVALID_APP_ARGUMENT = 'invalid-app-argument'
 }
 
@@ -33,8 +32,6 @@ const ERRORS: ErrorMap<AppError> = {
   [AppError.BAD_APP_NAME]: "Illegal App name: '{$appName}",
   [AppError.DUPLICATE_APP]: "Firebase App named '{$appName}' already exists",
   [AppError.APP_DELETED]: "Firebase App named '{$appName}' already deleted",
-  [AppError.DUPLICATE_SERVICE]:
-    "Firebase service named '{$appName}' already registered",
   [AppError.INVALID_APP_ARGUMENT]:
     'firebase.{$appName}() takes either no argument or a ' +
     'Firebase App instance.'

packages/app/src/firebaseNamespaceCore.ts

@@ -35,6 +35,7 @@ import { ERROR_FACTORY, AppError } from './errors';
 import { FirebaseAppLiteImpl } from './lite/firebaseAppLite';
 import { DEFAULT_ENTRY_NAME } from './constants';
 import { version } from '../../firebase/package.json';
+import { logger } from './logger';
 
 /**
  * Because auth can't share code with other components, we attach the utility functions
@@ -180,9 +181,13 @@ export function createFirebaseNamespaceCore(
     appHook?: AppHook,
     allowMultipleInstances = false
   ): FirebaseServiceNamespace<FirebaseService> {
-    // Cannot re-register a service that already exists
+    // If re-registering a service that already exists, return existing service
     if (factories[name]) {
-      throw ERROR_FACTORY.create(AppError.DUPLICATE_SERVICE, { appName: name });
+      logger.debug(`There were multiple attempts to register service ${name}.`);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      return (namespace as any)[name] as FirebaseServiceNamespace<
+        FirebaseService
+      >;
     }
 
     // Capture the service factory for later service instantiation

packages/app/src/logger.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2019 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Logger } from '@firebase/logger';
+
+export const logger = new Logger('@firebase/app');

packages/app/test/firebaseApp.test.ts

@@ -24,6 +24,7 @@ import {
 import { createFirebaseNamespace } from '../src/firebaseNamespace';
 import { createFirebaseNamespaceLite } from '../src/lite/firebaseNamespaceLite';
 import { assert } from 'chai';
+import { stub } from 'sinon';
 
 executeFirebaseTests();
 executeFirebaseLiteTests();
@@ -87,6 +88,28 @@ function executeFirebaseTests(): void {
       assert.equal(registrations, 2);
     });
 
+    it('Will do nothing if registerService is called again with the same name', () => {
+      const registerStub = stub(
+        (firebase as _FirebaseNamespace).INTERNAL,
+        'registerService'
+      ).callThrough();
+      (firebase as _FirebaseNamespace).INTERNAL.registerService(
+        'test',
+        (app: FirebaseApp) => new TestService(app)
+      );
+      firebase.initializeApp({});
+      const serviceNamespace = (firebase as any).test;
+
+      (firebase as _FirebaseNamespace).INTERNAL.registerService(
+        'test',
+        (app: FirebaseApp) => new TestService(app)
+      );
+
+      const serviceNamespace2 = (firebase as any).test;
+      assert.strictEqual(serviceNamespace, serviceNamespace2);
+      assert.doesNotThrow(registerStub);
+    });
+
     it('Can lazy load a service', () => {
       let registrations = 0;