Merge pull request angular#1021 from Kamshak/patch-1

fix(FirebaseApp): Return app if it exists

Author: jamesdaniels

rollup-globals.js

@@ -7,5 +7,6 @@ export default (mod) => {
 
   if (mod === 'firebase') return 'firebase';
   if (mod === '@angular/core') return 'ng.core';
+  if (mod === '@angular/platform-browser') return 'ng.platformBrowser';
   if (mod === '@angular/core/testing') return 'ng.core.testing';
 }

src/angularfire2.spec.ts

@@ -1,16 +1,19 @@
 import * as firebase from 'firebase/app';
-import { TestBed, inject } from '@angular/core/testing';
-import { ReflectiveInjector, Provider } from '@angular/core';
+import { TestBed, inject, withModule, async } from '@angular/core/testing';
+import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from './angularfire2';
 import { Subscription } from 'rxjs/Subscription';
 import { COMMON_CONFIG } from './test-config';
+import { BrowserModule } from '@angular/platform-browser';
 
 describe('angularfire', () => {
   let subscription:Subscription;
   let app: FirebaseApp;
   let rootRef: firebase.database.Reference;
   let questionsRef: firebase.database.Reference;
   let listOfQuestionsRef: firebase.database.Reference;
+  let defaultPlatform: PlatformRef;
+
   const APP_NAME = 'super-awesome-test-firebase-app-name';
 
   beforeEach(() => {
@@ -19,11 +22,12 @@ describe('angularfire', () => {
       imports: [AngularFireModule.initializeApp(COMMON_CONFIG, APP_NAME)]
     });
 
-    inject([FirebaseApp], (_app: FirebaseApp) => {
+    inject([FirebaseApp, PlatformRef], (_app: FirebaseApp, _platform: PlatformRef) => {
       app = _app;
       rootRef = app.database().ref();
       questionsRef = rootRef.child('questions');
       listOfQuestionsRef = rootRef.child('list-of-questions');
+      defaultPlatform = _platform;
     })();
 
   });
@@ -43,5 +47,28 @@ describe('angularfire', () => {
     it('should have the provided name', () => {
       expect(app.name).toBe(APP_NAME);
     })
+    it('should use an already intialized firebase app if it exists', done => {
+      @NgModule({
+        imports: [
+          AngularFireModule.initializeApp(COMMON_CONFIG, APP_NAME),
+          BrowserModule
+        ]})
+      class MyModule {
+        ngDoBootstrap() {}
+      }
+
+      const compilerFactory: CompilerFactory =
+          defaultPlatform.injector.get(CompilerFactory, null);
+      const moduleFactory = compilerFactory.createCompiler().compileModuleSync(MyModule);
+
+      defaultPlatform.bootstrapModuleFactory(moduleFactory)
+        .then(moduleRef => {
+          const ref = moduleRef.injector.get(FirebaseApp);
+          expect(ref.name).toEqual(app.name);
+        }).then(done, e => {
+          fail(e);
+          done()
+        });
+    })
   });
 });

src/app/firebase.app.module.ts

@@ -23,6 +23,10 @@ export function _firebaseAppFactory(config: FirebaseAppConfig, appName?: string)
     }
   }
   catch (e) {
+    if (e.code === "app/duplicate-app") {
+      return firebase.app(e.name);
+    }
+
     return firebase.app(null);
   }
 }