Skip to content

Commit 513565a

Browse files
jamesdanielsdavideast
jamesdaniels
authored and
davideast
committed
fix(): allow initializeApp to be used with AOT (angular#1654)
1 parent a8414f5 commit 513565a

File tree

14 files changed

+44
-61
lines changed

14 files changed

+44
-61
lines changed

‎src/auth/auth.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { User } from '@firebase/auth-types';
22
import { ReflectiveInjector, Provider } from '@angular/core';
33
import { Observable, Subject } from 'rxjs'
44
import { TestBed, inject } from '@angular/core/testing';
5-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseAppNameToken } from 'angularfire2';
5+
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2';
66
import { AngularFireAuth, AngularFireAuthModule } from 'angularfire2/auth';
77
import { COMMON_CONFIG } from './test-config';
88
import { take, skip } from 'rxjs/operators';
@@ -136,7 +136,7 @@ describe('AngularFireAuth with different app', () => {
136136
AngularFireAuthModule
137137
],
138138
providers: [
139-
{ provide: FirebaseAppNameToken, useValue: FIREBASE_APP_NAME_TOO },
139+
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
140140
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG }
141141
]
142142
});

‎src/auth/auth.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Injectable, Inject, Optional, NgZone, PLATFORM_ID } from '@angular/core
44
import { Observable, of, from } from 'rxjs';
55
import { switchMap } from 'rxjs/operators';
66

7-
import { FirebaseOptionsToken, FirebaseAppConfigToken, FirebaseAppNameToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
7+
import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
88

99

1010
@Injectable()
@@ -39,14 +39,13 @@ export class AngularFireAuth {
3939

4040
constructor(
4141
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
42-
@Optional() @Inject(FirebaseAppConfigToken) config:FirebaseAppConfig,
43-
@Optional() @Inject(FirebaseAppNameToken) name:string,
42+
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
4443
@Inject(PLATFORM_ID) platformId: Object,
4544
private zone: NgZone
4645
) {
4746
const scheduler = new FirebaseZoneScheduler(zone, platformId);
4847
this.auth = zone.runOutsideAngular(() => {
49-
const app = _firebaseAppFactory(options, name, config);
48+
const app = _firebaseAppFactory(options, nameOrConfig);
5049
return app.auth();
5150
});
5251

‎src/core/angularfire2.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import { first } from 'rxjs/operators';
66
import firebase from '@firebase/app';
77
import { FirebaseApp, FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
88

9-
export const FirebaseAppNameToken = new InjectionToken<string|undefined>('angularfire2.app.name');
109
export const FirebaseOptionsToken = new InjectionToken<FirebaseOptions>('angularfire2.app.options');
11-
export const FirebaseAppConfigToken = new InjectionToken<FirebaseAppConfig|undefined>('angularfire2.app.config');
10+
export const FirebaseNameOrConfigToken = new InjectionToken<string|FirebaseAppConfig|undefined>('angularfire2.app.nameOrConfig')
1211

1312
// Put in database.ts when we drop database-depreciated
1413
export const RealtimeDatabaseURL = new InjectionToken<string>('angularfire2.realtimeDatabaseURL');

‎src/core/firebase.app.module.ts‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { InjectionToken, NgZone, NgModule, Optional } from '@angular/core';
22

3-
import { FirebaseOptionsToken, FirebaseAppNameToken, FirebaseAppConfigToken } from './angularfire2';
3+
import { FirebaseOptionsToken, FirebaseNameOrConfigToken } from './angularfire2';
44

55
import firebase from '@firebase/app';
66
import { FirebaseApp as _FirebaseApp, FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
@@ -22,12 +22,10 @@ export class FirebaseApp implements _FirebaseApp {
2222
firestore: () => FirebaseFirestore;
2323
}
2424

25-
export function _firebaseAppFactory(options: FirebaseOptions, name?: string, appConfig?: FirebaseAppConfig): FirebaseApp {
26-
const config = appConfig || {};
27-
if (name && config.name && config.name !== name) {
28-
console.warn('FirebaseAppNameToken and FirebaseAppConfigToken.name don\'t match, FirebaseAppNameToken takes precedence.');
29-
}
30-
config.name = name || config.name || '[DEFAULT]';
25+
export function _firebaseAppFactory(options: FirebaseOptions, nameOrConfig?: string | FirebaseAppConfig) {
26+
const name = typeof nameOrConfig === 'string' && nameOrConfig || '[DEFAULT]';
27+
const config = typeof nameOrConfig === 'object' && nameOrConfig || {};
28+
config.name = config.name || name;
3129
const existingApp = firebase.apps.filter(app => app.name === config.name)[0];
3230
return (existingApp || firebase.initializeApp(options, config)) as FirebaseApp;
3331
}
@@ -37,24 +35,20 @@ const FirebaseAppProvider = {
3735
useFactory: _firebaseAppFactory,
3836
deps: [
3937
FirebaseOptionsToken,
40-
[new Optional(), FirebaseAppNameToken],
41-
[new Optional(), FirebaseAppConfigToken]
38+
[new Optional(), FirebaseNameOrConfigToken]
4239
]
4340
};
4441

4542
@NgModule({
4643
providers: [ FirebaseAppProvider ],
4744
})
4845
export class AngularFireModule {
49-
static initializeApp(options: FirebaseOptions, appNameOrConfig?: string | FirebaseAppConfig) {
50-
const name = typeof appNameOrConfig === 'string' && appNameOrConfig || undefined
51-
const config = typeof appNameOrConfig === 'object' && appNameOrConfig || undefined
46+
static initializeApp(options: FirebaseOptions, nameOrConfig?: string | FirebaseAppConfig) {
5247
return {
5348
ngModule: AngularFireModule,
5449
providers: [
55-
{ provide: FirebaseOptionsToken, useValue: options },
56-
{ provide: FirebaseAppNameToken, useValue: name },
57-
{ provide: FirebaseAppConfigToken, useValue: config }
50+
{ provide: FirebaseOptionsToken, useValue: options },
51+
{ provide: FirebaseNameOrConfigToken, useValue: nameOrConfig }
5852
]
5953
}
6054
}

‎src/database-deprecated/database.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FirebaseObjectFactory } from './firebase_object_factory';
77
import { FirebaseObjectObservable } from './firebase_object_observable';
88
import * as utils from './utils';
99
import { FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
10-
import { FirebaseAppConfigToken, FirebaseOptionsToken, FirebaseAppNameToken, RealtimeDatabaseURL, _firebaseAppFactory } from 'angularfire2';
10+
import { FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory } from 'angularfire2';
1111

1212
@Injectable()
1313
export class AngularFireDatabase {
@@ -19,13 +19,12 @@ export class AngularFireDatabase {
1919

2020
constructor(
2121
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
22-
@Inject(FirebaseAppConfigToken) config:FirebaseAppConfig,
23-
@Optional() @Inject(FirebaseAppNameToken) name:string,
22+
@Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
2423
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string,
2524
zone: NgZone
2625
) {
2726
this.database = zone.runOutsideAngular(() => {
28-
const app = _firebaseAppFactory(options, name, config);
27+
const app = _firebaseAppFactory(options, nameOrConfig);
2928
return app.database(databaseURL || undefined);
3029
});
3130
}

‎src/database/database.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FirebaseApp, AngularFireModule, FirebaseOptionsToken, FirebaseAppNameToken } from 'angularfire2';
1+
import { FirebaseApp, AngularFireModule, FirebaseOptionsToken, FirebaseNameOrConfigToken } from 'angularfire2';
22
import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from 'angularfire2/database';
33
import { TestBed, inject } from '@angular/core/testing';
44
import { COMMON_CONFIG } from './test-config';
@@ -42,7 +42,7 @@ describe('AngularFireDatabase', () => {
4242
});
4343

4444
it('should accept a Firebase App in the constructor', () => {
45-
const __db = new AngularFireDatabase(app.options, undefined!, app.name, undefined!, {}, zone);
45+
const __db = new AngularFireDatabase(app.options, app.name, undefined!, {}, zone);
4646
expect(__db instanceof AngularFireDatabase).toEqual(true);
4747
});
4848

@@ -69,7 +69,7 @@ describe('AngularFireDatabase w/options', () => {
6969
AngularFireDatabaseModule
7070
],
7171
providers: [
72-
{ provide: FirebaseAppNameToken, useValue: FIREBASE_APP_NAME_TOO },
72+
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
7373
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
7474
{ provide: RealtimeDatabaseURL, useValue: FIREBASE_DB_NAME }
7575
]

‎src/database/database.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { InjectionToken } from '@angular/core';
66
import { FirebaseOptions, FirebaseAppConfig } from '@firebase/app-types';
77
import { createListReference } from './list/create-reference';
88
import { createObjectReference } from './object/create-reference';
9-
import { FirebaseOptionsToken, FirebaseAppConfigToken, FirebaseAppNameToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
9+
import { FirebaseOptionsToken, FirebaseNameOrConfigToken, RealtimeDatabaseURL, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
1010

1111
@Injectable()
1212
export class AngularFireDatabase {
@@ -15,15 +15,14 @@ export class AngularFireDatabase {
1515

1616
constructor(
1717
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
18-
@Optional() @Inject(FirebaseAppConfigToken) config:FirebaseAppConfig,
19-
@Optional() @Inject(FirebaseAppNameToken) name:string,
18+
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
2019
@Optional() @Inject(RealtimeDatabaseURL) databaseURL:string,
2120
@Inject(PLATFORM_ID) platformId: Object,
2221
zone: NgZone
2322
) {
2423
this.scheduler = new FirebaseZoneScheduler(zone, platformId);
2524
this.database = zone.runOutsideAngular(() => {
26-
const app = _firebaseAppFactory(options, name, config);
25+
const app = _firebaseAppFactory(options, nameOrConfig);
2726
return app.database(databaseURL || undefined);
2827
});
2928
}

‎src/firestore/firestore.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseAppNameToken } from 'angularfire2';
1+
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2';
22
import { AngularFirestore } from './firestore';
33
import { AngularFirestoreModule } from './firestore.module';
44
import { AngularFirestoreDocument } from './document/document';
@@ -105,7 +105,7 @@ describe('AngularFirestore with different app', () => {
105105
AngularFirestoreModule
106106
],
107107
providers: [
108-
{ provide: FirebaseAppNameToken, useValue: FIREBASE_APP_NAME_TOO },
108+
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
109109
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG }
110110
]
111111
});

‎src/firestore/firestore.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { QueryFn, AssociatedReference } from './interfaces';
99
import { AngularFirestoreDocument } from './document/document';
1010
import { AngularFirestoreCollection } from './collection/collection';
1111

12-
import { FirebaseAppConfigToken, FirebaseOptionsToken, FirebaseAppNameToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
12+
import { FirebaseOptionsToken, FirebaseNameOrConfigToken, _firebaseAppFactory, FirebaseZoneScheduler } from 'angularfire2';
1313

1414
/**
1515
* The value of this token determines whether or not the firestore will have persistance enabled
@@ -106,16 +106,15 @@ export class AngularFirestore {
106106
*/
107107
constructor(
108108
@Inject(FirebaseOptionsToken) options:FirebaseOptions,
109-
@Optional() @Inject(FirebaseAppConfigToken) config:FirebaseAppConfig,
110-
@Optional() @Inject(FirebaseAppNameToken) name:string,
109+
@Optional() @Inject(FirebaseNameOrConfigToken) nameOrConfig:string|FirebaseAppConfig|undefined,
111110
@Optional() @Inject(EnablePersistenceToken) shouldEnablePersistence: boolean,
112111
@Optional() @Inject(FirestoreSettingsToken) settings: Settings,
113112
@Inject(PLATFORM_ID) platformId: Object,
114113
zone: NgZone
115114
) {
116115
this.scheduler = new FirebaseZoneScheduler(zone, platformId);
117116
this.firestore = zone.runOutsideAngular(() => {
118-
const app = _firebaseAppFactory(options, name, config);
117+
const app = _firebaseAppFactory(options, nameOrConfig);
119118
const firestore = app.firestore();
120119
firestore.settings(settings || DefaultFirestoreSettings);
121120
return firestore;

‎src/storage/storage.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Observable, forkJoin } from 'rxjs'
22
import { map, mergeMap, tap } from 'rxjs/operators';
33
import { TestBed, inject } from '@angular/core/testing';
4-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseAppNameToken } from 'angularfire2';
4+
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from 'angularfire2';
55
import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage';
66
import { COMMON_CONFIG } from './test-config';
77

@@ -140,7 +140,7 @@ describe('AngularFireStorage w/options', () => {
140140
AngularFireStorageModule
141141
],
142142
providers: [
143-
{ provide: FirebaseAppNameToken, useValue: FIREBASE_APP_NAME_TOO },
143+
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
144144
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
145145
{ provide: StorageBucket, useValue: FIREBASE_STORAGE_BUCKET }
146146
]

0 commit comments

Comments
 (0)