Skip to content

fix(auth): make statically analyzable x2 #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2016
Merged

fix(auth): make statically analyzable x2 #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/angularfire2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
FirebaseConfig,
FirebaseApp,
WindowLocation,
FirebaseUserConfig
FirebaseUserConfig,
FirebaseAuthConfig
} from './tokens';
import {
APP_INITIALIZER,
Expand Down Expand Up @@ -114,7 +115,7 @@ export class AngularFireModule {
providers: [
{ provide: FirebaseUserConfig, useValue: config },
{ provide: FirebaseConfig, useFactory: _getDefaultFirebase, deps: [FirebaseUserConfig] },
firebaseAuthConfig(authConfig)
{ provide: FirebaseAuthConfig, useValue: authConfig }
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/database/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { FirebaseAppConfig } from '../angularfire2';
import { FirebaseListFactory } from './index';
import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts } from '../interfaces';
import * as utils from '../utils';
import {
import {
FirebaseListObservable,
FirebaseObjectObservable,
FirebaseObjectFactory
Expand All @@ -13,7 +13,7 @@ import {
@Injectable()
export class AngularFireDatabase {
constructor(@Inject(FirebaseConfig) private fbConfig:FirebaseAppConfig,
@Inject(FirebaseApp) private fbApp:firebase.app.App) {}
@Inject(FirebaseApp) private fbApp:any) {}
list (urlOrRef:string | firebase.database.Reference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
return utils.checkForUrlOrFirebaseRef(urlOrRef, {
isUrl: () => FirebaseListFactory(this.fbApp.database().refFromURL(getAbsUrl(this.fbConfig, <string>urlOrRef)), opts),
Expand Down
1 change: 0 additions & 1 deletion tsconfig.publish.es5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"src/database/index.ts",
"src/auth/auth.ts",
"typings/index.d.ts",
"manual_typings/firebase3/firebase3.d.ts",
"node_modules/zone.js/dist/zone.js.d.ts"
],
"angularCompilerOptions": {
Expand Down
1 change: 0 additions & 1 deletion tsconfig.publish.es6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"src/database/index.ts",
"src/auth/auth.ts",
"typings/index.d.ts",
"manual_typings/firebase3/firebase3.d.ts",
"node_modules/zone.js/dist/zone.js.d.ts"
],
"angularCompilerOptions": {
Expand Down