chore(modules): Organizing Firebase module imports

Author: davideast

src/angularfire2.ts

@@ -2,9 +2,10 @@ import * as firebase from 'firebase/app';
 import * as utils from './utils';
 import { FirebaseAppConfigToken, FirebaseApp, _firebaseAppFactory } from './app/index';
 import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, FirebaseAppConfig } from './interfaces';
-import { FirebaseAppName } from './tokens';
 import { Injectable, InjectionToken, OpaqueToken, NgModule } from '@angular/core';
 
+const FirebaseAppName = new InjectionToken<string>('FirebaseAppName');
+
 export const FirebaseAppProvider = {
   provide: FirebaseApp,
   useFactory: _firebaseAppFactory,
@@ -26,4 +27,4 @@ export class AngularFireModule {
   }
 }
 
-export { FirebaseApp, FirebaseAppConfigToken, FirebaseAppConfig }
+export { FirebaseApp, FirebaseAppName, FirebaseAppConfigToken, FirebaseAppConfig };

src/app/firebase.app.module.ts

@@ -1,7 +1,8 @@
-import { Injectable, Inject, InjectionToken, NgModule, ModuleWithProviders } from '@angular/core';
+import { InjectionToken, } from '@angular/core';
+import { FirebaseAppConfig } from '../interfaces';
 import * as firebase from 'firebase/app';
 
-export const FirebaseAppConfigToken = new InjectionToken('FirebaseAppConfigToken');
+export const FirebaseAppConfigToken = new InjectionToken<FirebaseAppConfig>('FirebaseAppConfigToken');
 
 export class FirebaseApp implements firebase.app.App {
   name: string;
@@ -13,7 +14,7 @@ export class FirebaseApp implements firebase.app.App {
   delete: () => firebase.Promise<any>;
 }
 
-export function _firebaseAppFactory(config: {}, appName?: string): FirebaseApp {
+export function _firebaseAppFactory(config: FirebaseAppConfig, appName?: string): FirebaseApp {
   try {
     if (appName) {
       return firebase.initializeApp(config, appName);
@@ -25,24 +26,3 @@ export function _firebaseAppFactory(config: {}, appName?: string): FirebaseApp {
     return firebase.app(null);
   }
 }
-
-export const FirebaseAppProvider = {
-  provide: FirebaseApp,
-  useFactory: _firebaseAppFactory,
-  deps: [ FirebaseAppConfigToken ]
-};
-
-@NgModule({
-  providers: [FirebaseAppProvider]
-})
-export class FirebaseAppModule {
-  static initializeApp(config): ModuleWithProviders {
-    return {
-      ngModule: FirebaseAppModule,
-      providers: [
-        { provide: FirebaseAppConfigToken, useValue: config },
-        FirebaseAppProvider,
-      ]
-    }
-  }
-}

src/database/database.module.ts

@@ -1,9 +1,8 @@
 import { NgModule } from '@angular/core';
 import * as firebase from 'firebase/app';
 import 'firebase/database';
-import { FirebaseApp } from '../app/index';
-import { AngularFireModule } from '../angularfire2';
-import { AngularFireDatabase } from './index';
+import { AngularFireModule, FirebaseApp } from '../angularfire2';
+import { AngularFireDatabase } from './database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
   return new AngularFireDatabase(app);

src/interfaces.ts

@@ -7,6 +7,7 @@ export interface FirebaseAppConfig {
   databaseURL?: string;
   storageBucket?: string;
   messagingSenderId?: string;
+  projectId?: string;
 }
 
 export interface FirebaseOperationCases {