Make tests work again

Author: Feiyang1

integration/browserify/src/namespace.test.js

@@ -25,7 +25,8 @@ firebase.initializeApp({
   databaseURL: 'https://test-project-name.firebaseio.com',
   projectId: 'test-project-name',
   storageBucket: 'test-project-name.appspot.com',
-  messagingSenderId: '012345678910'
+  messagingSenderId: '012345678910',
+  appId: 'myAppId'
 });
 
 describe('Firebase Namespace Validation', function() {

integration/shared/namespaceDefinition.json

@@ -40,7 +40,7 @@
   },
   "INTERNAL": {
     "__type": "object",
-    "registerService": {
+    "registerComponent": {
       "__type": "function"
     },
     "extendNamespace": {
@@ -55,20 +55,8 @@
     "removeApp": {
       "__type": "function"
     },
-    "factories": {
-      "__type": "object",
-      "storage": {
-        "__type": "function"
-      },
-      "auth": {
-        "__type": "function"
-      },
-      "database": {
-        "__type": "function"
-      },
-      "messaging": {
-        "__type": "function"
-      }
+    "components": {
+      "__type": "Map"
     },
     "ErrorFactory": {
       "__type": "function"

integration/typescript/test/namespace.test.ts

@@ -25,7 +25,8 @@ firebase.initializeApp({
   databaseURL: 'https://test-project-name.firebaseio.com',
   projectId: 'test-project-name',
   storageBucket: 'test-project-name.appspot.com',
-  messagingSenderId: '012345678910'
+  messagingSenderId: '012345678910',
+  appId: 'myAppId'
 });
 
 describe('Firebase Namespace Validation', function() {

integration/webpack/src/namespace.test.js

@@ -25,7 +25,8 @@ firebase.initializeApp({
   databaseURL: 'https://test-project-name.firebaseio.com',
   projectId: 'test-project-name',
   storageBucket: 'test-project-name.appspot.com',
-  messagingSenderId: '012345678910'
+  messagingSenderId: '012345678910',
+  appId: 'myAppId'
 });
 
 describe('Firebase Namespace Validation', function() {

packages/app-types/index.d.ts

@@ -1,5 +1,3 @@
-import { Provider } from '@firebase/component';
-
 /**
  * @license
  * Copyright 2017 Google Inc.
@@ -103,3 +101,9 @@ export interface FirebaseNamespace {
   // The current SDK version.
   SDK_VERSION: string;
 }
+
+declare module '@firebase/component' {
+  interface ComponentContainer {
+    getProvider(name: 'app'): Provider<FirebaseApp>;
+  }
+}

packages/app-types/private.d.ts

@@ -24,7 +24,7 @@ import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
 import { Observer, Subscribe } from '@firebase/util';
 import { FirebaseError, ErrorFactory } from '@firebase/util';
 import { Deferred } from '../firestore/test/util/promise';
-import { Component } from '@firebase/component';
+import { Component, ComponentContainer } from '@firebase/component';
 
 export interface FirebaseServiceInternals {
   /**
@@ -82,7 +82,8 @@ export interface FirebaseAppInternals {
 }
 
 export interface _FirebaseApp extends FirebaseApp {
-  _addComponent(component: Component): void;
+  container: ComponentContainer;
+  _addComponent(component: Component, overwrite?: boolean): void;
   _removeServiceInstance(name: string, instanceIdentifier?: string): void;
 }
 export interface _FirebaseNamespace extends FirebaseNamespace {

packages/app/index.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-import { FirebaseNamespace, FirebaseApp } from '@firebase/app-types';
+import { FirebaseNamespace } from '@firebase/app-types';
 import { firebase as firebaseNamespace } from './src/firebaseNamespace';
 import { isNode, isBrowser } from '@firebase/util';
-import { Provider } from '@firebase/component';
 import { logger } from './src/logger';
 
 // Firebase Lite detection
@@ -70,9 +69,3 @@ export const firebase = firebaseNamespace;
 
 // eslint-disable-next-line import/no-default-export
 export default firebase;
-
-declare module '@firebase/component' {
-  interface ComponentContainer {
-    getProvider(name: 'app'): Provider<FirebaseApp>;
-  }
-}

packages/app/src/firebaseApp.ts

@@ -125,7 +125,7 @@ export class FirebaseAppImpl implements FirebaseApp {
     // getImmediate will always succeed because _getService is only called for registered components.
     return this.container
       .getProvider(name)
-      .getImmediate(instanceIdentifier) as FirebaseService;
+      .getImmediate({identifier: instanceIdentifier}) as FirebaseService;
   }
   /**
    * Remove a service instance from the cache, so we will create a new instance for this service

packages/app/src/lite/firebaseAppLite.ts

@@ -135,7 +135,7 @@ export class FirebaseAppLiteImpl implements FirebaseApp {
     // getImmediate will always succeed because _getService is only called for registered components.
     return this.container
       .getProvider(name)
-      .getImmediate(instanceIdentifier) as FirebaseService;
+      .getImmediate({identifier: instanceIdentifier}) as FirebaseService;
   }
 
   /**

packages/component/src/provider.ts

@@ -32,7 +32,7 @@ export class Provider<T = unknown> {
   constructor(
     private readonly name: string,
     private readonly container: ComponentContainer
-  ) {}
+  ) { }
 
   /**
    * @param identifier A provider can provide mulitple instances of a service
@@ -46,9 +46,14 @@ export class Provider<T = unknown> {
       const deferred = new Deferred<T>();
       this.instancesDeferred.set(normalizedIdentifier, deferred);
       // If the service instance is available, resolve the promise with it immediately
-      const instance = this.getOrInitializeService(normalizedIdentifier);
-      if (instance) {
-        deferred.resolve(instance);
+      try {
+        const instance = this.getOrInitializeService(normalizedIdentifier);
+        if (instance) {
+          deferred.resolve(instance);
+        }
+      } catch (e) {
+        // when the instance factory throws an exception during get(), it should not cause
+        // an fatal error. We just return the unresolved promise in this case.
       }
     }
 
@@ -76,17 +81,23 @@ export class Provider<T = unknown> {
     };
     // if multipleInstances is not supported, use the default name
     const normalizedIdentifier = this.normalizeInstanceIdentifier(identifier);
+    try {
+      const instance = this.getOrInitializeService(normalizedIdentifier);
 
-    const instance = this.getOrInitializeService(normalizedIdentifier);
-
-    if (!instance) {
-      if (optional) {
+      if (!instance) {
+        if (optional) {
+          return null;
+        }
+        throw Error(`Service ${this.name} is not available`);
+      }
+      return instance;
+    } catch (e) {
+      if(optional) {
         return null;
+      } else {
+        throw e;
       }
-      throw Error(`Service ${this.name} is not available`);
     }
-
-    return instance;
   }
 
   setComponent(component: Component<T>): void {
@@ -103,7 +114,14 @@ export class Provider<T = unknown> {
     this.component = component;
     // if the service is eager, initialize the default instance
     if (isComponentEager(component)) {
-      this.getOrInitializeService(DEFAULT_ENTRY_NAME);
+      try {
+        this.getOrInitializeService(DEFAULT_ENTRY_NAME);
+      } catch (e) {
+        // when the instance factory for an eager Component throws an exception during the eager 
+        // initialization, it should not cause an fatal error.
+        // TODO: Investigate if we need to make it configurable, because some component may want to cause
+        // a fatal error in this case?
+      }
     }
 
     // Create service instances for the pending promises and resolve them
@@ -117,10 +135,15 @@ export class Provider<T = unknown> {
         instanceIdentifier
       );
 
-      // `getOrInitializeService()` should always return a valid instance since a component is guaranteed. use ! to make typescript happy.
-      const instance = this.getOrInitializeService(normalizedIdentifier)!;
+      try {
+        // `getOrInitializeService()` should always return a valid instance since a component is guaranteed. use ! to make typescript happy.
+        const instance = this.getOrInitializeService(normalizedIdentifier)!;
+        instanceDeferred.resolve(instance);
+      } catch (e) {
+        // when the instance factory throws an exception, it should not cause
+        // an fatal error. We just leave the promise unresolved.
+      }
 
-      instanceDeferred.resolve(instance);
     }
   }
 

packages/functions/src/context.ts

@@ -37,8 +37,8 @@ export class ContextProvider {
     authProvider: Provider<FirebaseAuthInternal>,
     messagingProvider: Provider<FirebaseMessaging>
   ) {
-    this.auth = authProvider.getImmediate(undefined, { optional: true });
-    this.messaging = messagingProvider.getImmediate(undefined, {
+    this.auth = authProvider.getImmediate({ optional: true });
+    this.messaging = messagingProvider.getImmediate({
       optional: true
     });
 

packages/messaging-types/index.d.ts

@@ -49,3 +49,11 @@ export class FirebaseMessaging {
   useServiceWorker(registration: ServiceWorkerRegistration): void;
   usePublicVapidKey(b64PublicKey: string): void;
 }
+
+declare module '@firebase/component' {
+  interface ComponentContainer {
+    getProvider(name: 'messaging'): Provider<FirebaseMessaging>;
+  }
+
+  interface Provider { }
+}

packages/rxfire/test/database.test.ts

@@ -92,6 +92,7 @@ describe('RxFire Database', () => {
    */
   beforeEach(() => {
     app = initializeApp({
+      apiKey: TEST_PROJECT.apiKey,
       projectId: TEST_PROJECT.projectId,
       databaseURL: TEST_PROJECT.databaseURL
     });

packages/storage/src/implementation/authwrapper.ts

@@ -89,7 +89,7 @@ export class AuthWrapper {
   }
 
   getAuthToken(): Promise<string | null> {
-    const auth = this.authProvider_.getImmediate(undefined, { optional: true });
+    const auth = this.authProvider_.getImmediate({ optional: true });
     if (auth) {
       return auth.getToken().then(
         (response: FirebaseAuthTokenData | null): string | null => {