Skip to content

Commit ab80954

Browse files
robwormalddavideast
authored andcommitted
fix(auth): make statically analyzable x2 (#427)
1 parent 658517b commit ab80954

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/angularfire2.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
FirebaseConfig,
1010
FirebaseApp,
1111
WindowLocation,
12-
FirebaseUserConfig
12+
FirebaseUserConfig,
13+
FirebaseAuthConfig
1314
} from './tokens';
1415
import {
1516
APP_INITIALIZER,
@@ -114,7 +115,7 @@ export class AngularFireModule {
114115
providers: [
115116
{ provide: FirebaseUserConfig, useValue: config },
116117
{ provide: FirebaseConfig, useFactory: _getDefaultFirebase, deps: [FirebaseUserConfig] },
117-
firebaseAuthConfig(authConfig)
118+
{ provide: FirebaseAuthConfig, useValue: authConfig }
118119
]
119120
}
120121
}

src/database/database.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FirebaseAppConfig } from '../angularfire2';
44
import { FirebaseListFactory } from './index';
55
import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts } from '../interfaces';
66
import * as utils from '../utils';
7-
import {
7+
import {
88
FirebaseListObservable,
99
FirebaseObjectObservable,
1010
FirebaseObjectFactory
@@ -13,7 +13,7 @@ import {
1313
@Injectable()
1414
export class AngularFireDatabase {
1515
constructor(@Inject(FirebaseConfig) private fbConfig:FirebaseAppConfig,
16-
@Inject(FirebaseApp) private fbApp:firebase.app.App) {}
16+
@Inject(FirebaseApp) private fbApp:any) {}
1717
list (urlOrRef:string | firebase.database.Reference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
1818
return utils.checkForUrlOrFirebaseRef(urlOrRef, {
1919
isUrl: () => FirebaseListFactory(this.fbApp.database().refFromURL(getAbsUrl(this.fbConfig, <string>urlOrRef)), opts),

tsconfig.publish.es5.json

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"src/database/index.ts",
2222
"src/auth/auth.ts",
2323
"typings/index.d.ts",
24-
"manual_typings/firebase3/firebase3.d.ts",
2524
"node_modules/zone.js/dist/zone.js.d.ts"
2625
],
2726
"angularCompilerOptions": {

tsconfig.publish.es6.json

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"src/database/index.ts",
2323
"src/auth/auth.ts",
2424
"typings/index.d.ts",
25-
"manual_typings/firebase3/firebase3.d.ts",
2625
"node_modules/zone.js/dist/zone.js.d.ts"
2726
],
2827
"angularCompilerOptions": {

0 commit comments

Comments
 (0)