Skip to content

Commit 8723dbd

Browse files
davideastjeffbcross
authored andcommitted
chore(modules): Auth modules
1 parent 32ecc2a commit 8723dbd

13 files changed

+42
-42
lines changed

src/angularfire2.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { initializeApp } from 'firebase';
22
import * as utils from './utils/utils';
33
import { FirebaseAppConfig } from './interfaces';
4-
import { FirebaseSdkAuthBackend } from './providers/firebase_sdk_auth_backend';
54
import {
65
FirebaseListFactoryOpts,
76
FirebaseObjectFactoryOpts,
@@ -20,23 +19,22 @@ import {
2019
Provider
2120
} from '@angular/core';
2221
import {
22+
FirebaseSdkAuthBackend,
2323
AngularFireAuth,
2424
firebaseAuthConfig,
25-
FirebaseAuth
26-
} from './providers/auth';
25+
FirebaseAuth,
26+
AuthBackend,
27+
AuthMethods,
28+
AuthProviders,
29+
FirebaseAuthState
30+
} from './auth/index';
2731
import {
2832
FirebaseListObservable,
2933
FirebaseObjectObservable,
3034
FirebaseListFactory,
3135
FirebaseObjectFactory,
3236
FirebaseDatabase
3337
} from './database/index';
34-
import {
35-
AuthBackend,
36-
AuthMethods,
37-
AuthProviders,
38-
FirebaseAuthState
39-
} from './providers/auth_backend';
4038

4139
@Injectable()
4240
export class AngularFire {

src/angularfire2_worker_app.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {provide} from '@angular/core';
2-
import {COMMON_PROVIDERS} from './angularfire2';
3-
import {AuthBackend} from './providers/auth_backend';
4-
import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
1+
import { provide } from '@angular/core';
2+
import { COMMON_PROVIDERS } from './angularfire2';
3+
import { AuthBackend } from './auth/index';
4+
import { WebWorkerFirebaseAuth } from './providers/web_workers/worker/auth';
55

66
export const WORKER_APP_FIREBASE_PROVIDERS: any[] = [
77
COMMON_PROVIDERS,

src/angularfire2_worker_render.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {provide} from '@angular/core';
2-
import {COMMON_PROVIDERS} from './angularfire2';
3-
import {FirebaseSdkAuthBackend} from './providers/firebase_sdk_auth_backend';
4-
import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
5-
import {FirebaseApp} from './tokens';
6-
import {MessageBasedFirebaseAuth} from './providers/web_workers/ui/auth';
1+
import { provide } from '@angular/core';
2+
import { COMMON_PROVIDERS } from './angularfire2';
3+
import { FirebaseSdkAuthBackend } from './auth/index';
4+
import { WebWorkerFirebaseAuth } from './providers/web_workers/worker/auth';
5+
import { FirebaseApp } from './tokens';
6+
import { MessageBasedFirebaseAuth } from './providers/web_workers/ui/auth';
77

88
export const WORKER_RENDER_FIREBASE_PROVIDERS: any[] = [
99
COMMON_PROVIDERS,

src/providers/auth.spec.ts renamed to src/auth/auth.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import { auth, initializeApp } from 'firebase';
2+
import {ReflectiveInjector, provide, Provider} from '@angular/core';
3+
import { Observable } from 'rxjs/Observable'
4+
import { Observer } from 'rxjs/Observer';
25
import {
36
beforeEachProviders,
47
expect,
@@ -9,9 +12,6 @@ import {
912
iit,
1013
beforeEach
1114
} from '@angular/core/testing';
12-
import {ReflectiveInjector, provide, Provider} from '@angular/core';
13-
import { Observable } from 'rxjs/Observable'
14-
import { Observer } from 'rxjs/Observer';
1515
import 'rxjs/add/operator/do';
1616

1717
import {

src/providers/auth.ts renamed to src/auth/auth.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import {Provider, Inject, provide, Injectable, Optional} from '@angular/core';
1+
import { Provider, Inject, provide, Injectable, Optional } from '@angular/core';
22
import { Observable } from 'rxjs/Observable';
33
import { Observer } from 'rxjs/Observer';
4-
import {ReplaySubject} from 'rxjs/ReplaySubject';
5-
6-
import 'rxjs/add/operator/mergeMap';
7-
import 'rxjs/add/operator/take';
8-
import 'rxjs/add/operator/concat';
9-
import 'rxjs/add/operator/skip';
10-
import 'rxjs/add/observable/of';
11-
4+
import { ReplaySubject } from 'rxjs/ReplaySubject';
125
import { FirebaseApp, FirebaseAuthConfig, WindowLocation } from '../tokens';
13-
import {isPresent} from '../utils/utils';
6+
import { isPresent } from '../utils/utils';
147
import * as utils from '../utils/utils';
158
import {
169
authDataToAuthState,
@@ -23,6 +16,11 @@ import {
2316
FirebaseAuthState,
2417
stripProviderId
2518
} from './auth_backend';
19+
import 'rxjs/add/operator/mergeMap';
20+
import 'rxjs/add/operator/take';
21+
import 'rxjs/add/operator/concat';
22+
import 'rxjs/add/operator/skip';
23+
import 'rxjs/add/observable/of';
2624

2725
const kBufferSize = 1;
2826

File renamed without changes.
File renamed without changes.

src/providers/firebase_sdk_auth_backend.ts renamed to src/auth/firebase_sdk_auth_backend.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { Injectable, Inject } from '@angular/core';
22
import { Observable } from 'rxjs/Observable';
33
import { Observer } from 'rxjs/Observer';
4+
import { FirebaseApp } from '../tokens';
5+
import { isPresent } from '../utils/utils';
6+
import { auth } from 'firebase';
47
import {
58
authDataToAuthState,
69
AuthBackend,
@@ -9,9 +12,6 @@ import {
912
FirebaseAuthState,
1013
EmailPasswordCredentials
1114
} from './auth_backend';
12-
import {FirebaseApp} from '../tokens';
13-
import {isPresent} from '../utils/utils';
14-
import { auth } from 'firebase';
1515

1616
const {
1717
FacebookAuthProvider,

src/auth/index.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export * from './auth';
2+
export * from './auth_backend';
3+
export * from './firebase_sdk_auth_backend';

src/providers/web_workers/ui/auth.ts renamed to src/worker/auth/ui/auth.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {Injectable, Inject} from '@angular/core';
2-
import {ServiceMessageBrokerFactory, PRIMITIVE} from '@angular/platform-browser/src/worker_render';
3-
import {AUTH_CHANNEL, INITIAL_AUTH_CHANNEL} from '../shared/channels';
4-
import {FirebaseAuthState} from '../../auth_backend';
5-
import {FirebaseSdkAuthBackend} from '../../firebase_sdk_auth_backend';
1+
import { Injectable, Inject } from '@angular/core';
2+
import { ServiceMessageBrokerFactory, PRIMITIVE } from '@angular/platform-browser/src/worker_render';
3+
import { AUTH_CHANNEL, INITIAL_AUTH_CHANNEL } from '../shared/channels';
4+
import { FirebaseAuthState } from '../../auth_backend';
5+
import { FirebaseSdkAuthBackend } from '../../firebase_sdk_auth_backend';
66

77
@Injectable()
88
export class MessageBasedFirebaseAuth {

tsconfig.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
"src/database/firebase_list_observable.spec.ts",
2222
"src/database/firebase_object_observable.spec.ts",
2323
"src/database/query_observable.spec.ts",
24-
"src/providers/auth.spec.ts",
25-
"src/providers/auth_backend.spec.ts",
24+
"src/auth/auth.ts",
25+
"src/auth/auth.spec.ts",
26+
"src/auth/auth_backend.spec.ts",
2627
"typings/main.d.ts",
2728
"manual_typings/firebase3/firebase3.d.ts"
2829
]

0 commit comments

Comments
 (0)