chore(modules): Auth modules

stillzombie · Jun 30, 2016 · 8723dbd · 8723dbd
1 parent 32ecc2a
commit 8723dbd
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 42 deletions.
diff --git a/src/angularfire2.ts b/src/angularfire2.ts
@@ -1,7 +1,6 @@
 import { initializeApp } from 'firebase';
 import * as utils from './utils/utils';
 import { FirebaseAppConfig } from './interfaces';
-import { FirebaseSdkAuthBackend } from './providers/firebase_sdk_auth_backend';
 import { 
   FirebaseListFactoryOpts, 
   FirebaseObjectFactoryOpts,
@@ -20,23 +19,22 @@ import {
   Provider 
 } from '@angular/core';
 import { 
+  FirebaseSdkAuthBackend,
   AngularFireAuth, 
   firebaseAuthConfig, 
-  FirebaseAuth 
-} from './providers/auth';
+  FirebaseAuth,
+  AuthBackend,
+  AuthMethods,
+  AuthProviders,
+  FirebaseAuthState    
+} from './auth/index';
 import {
   FirebaseListObservable,
   FirebaseObjectObservable,
   FirebaseListFactory,
   FirebaseObjectFactory,
   FirebaseDatabase
 } from './database/index';
-import {
-  AuthBackend,
-  AuthMethods,
-  AuthProviders,
-  FirebaseAuthState
-} from './providers/auth_backend';
 
 @Injectable()
 export class AngularFire {

diff --git a/src/angularfire2_worker_app.ts b/src/angularfire2_worker_app.ts
@@ -1,7 +1,7 @@
-import {provide} from '@angular/core';
-import {COMMON_PROVIDERS} from './angularfire2';
-import {AuthBackend} from './providers/auth_backend';
-import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
+import { provide } from '@angular/core';
+import { COMMON_PROVIDERS } from './angularfire2';
+import { AuthBackend } from './auth/index';
+import { WebWorkerFirebaseAuth } from './providers/web_workers/worker/auth';
 
 export const WORKER_APP_FIREBASE_PROVIDERS: any[] = [
   COMMON_PROVIDERS,

diff --git a/src/angularfire2_worker_render.ts b/src/angularfire2_worker_render.ts
@@ -1,9 +1,9 @@
-import {provide} from '@angular/core';
-import {COMMON_PROVIDERS} from './angularfire2';
-import {FirebaseSdkAuthBackend} from './providers/firebase_sdk_auth_backend';
-import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
-import {FirebaseApp} from './tokens';
-import {MessageBasedFirebaseAuth} from './providers/web_workers/ui/auth';
+import { provide } from '@angular/core';
+import { COMMON_PROVIDERS } from './angularfire2';
+import { FirebaseSdkAuthBackend } from './auth/index';
+import { WebWorkerFirebaseAuth } from './providers/web_workers/worker/auth';
+import { FirebaseApp } from './tokens';
+import { MessageBasedFirebaseAuth } from './providers/web_workers/ui/auth';
 
 export const WORKER_RENDER_FIREBASE_PROVIDERS: any[] = [
   COMMON_PROVIDERS,

diff --git a/src/providers/auth.spec.ts → src/auth/auth.spec.ts b/src/providers/auth.spec.ts → src/auth/auth.spec.ts
@@ -1,4 +1,7 @@
 import { auth, initializeApp } from 'firebase';
+import {ReflectiveInjector, provide, Provider} from '@angular/core';
+import { Observable } from 'rxjs/Observable'
+import { Observer } from 'rxjs/Observer';
 import {
   beforeEachProviders,
   expect,
@@ -9,9 +12,6 @@ import {
   iit,
   beforeEach
 } from '@angular/core/testing';
-import {ReflectiveInjector, provide, Provider} from '@angular/core';
-import { Observable } from 'rxjs/Observable'
-import { Observer } from 'rxjs/Observer';
 import 'rxjs/add/operator/do';
 
 import {

diff --git a/src/providers/auth.ts → src/auth/auth.ts b/src/providers/auth.ts → src/auth/auth.ts
@@ -1,16 +1,9 @@
-import {Provider, Inject, provide, Injectable, Optional} from '@angular/core';
+import { Provider, Inject, provide, Injectable, Optional } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import {ReplaySubject} from 'rxjs/ReplaySubject';
-
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/operator/take';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/skip';
-import 'rxjs/add/observable/of';
-
+import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { FirebaseApp, FirebaseAuthConfig, WindowLocation } from '../tokens';
-import {isPresent} from '../utils/utils';
+import { isPresent } from '../utils/utils';
 import * as utils from '../utils/utils';
 import {
   authDataToAuthState,
@@ -23,6 +16,11 @@ import {
   FirebaseAuthState,
   stripProviderId
 } from './auth_backend';
+import 'rxjs/add/operator/mergeMap';
+import 'rxjs/add/operator/take';
+import 'rxjs/add/operator/concat';
+import 'rxjs/add/operator/skip';
+import 'rxjs/add/observable/of';
 
 const kBufferSize = 1;
 

diff --git a/src/providers/auth_backend.spec.ts → src/auth/auth_backend.spec.ts b/src/providers/auth_backend.spec.ts → src/auth/auth_backend.spec.ts
diff --git a/src/providers/auth_backend.ts → src/auth/auth_backend.ts b/src/providers/auth_backend.ts → src/auth/auth_backend.ts
diff --git a/src/providers/firebase_sdk_auth_backend.ts → src/auth/firebase_sdk_auth_backend.ts b/src/providers/firebase_sdk_auth_backend.ts → src/auth/firebase_sdk_auth_backend.ts
@@ -1,6 +1,9 @@
 import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
+import { FirebaseApp } from '../tokens';
+import { isPresent } from '../utils/utils';
+import { auth } from 'firebase';
 import {
   authDataToAuthState,
   AuthBackend,
@@ -9,9 +12,6 @@ import {
   FirebaseAuthState,
   EmailPasswordCredentials
 } from './auth_backend';
-import {FirebaseApp} from '../tokens';
-import {isPresent} from '../utils/utils';
-import { auth } from 'firebase';
 
 const {
   FacebookAuthProvider,

diff --git a/src/auth/index.ts b/src/auth/index.ts
@@ -0,0 +1,3 @@
+export * from './auth';
+export * from './auth_backend';
+export * from './firebase_sdk_auth_backend';
diff --git a/src/providers/web_workers/shared/channels.ts → src/worker/auth/shared/channels.ts b/src/providers/web_workers/shared/channels.ts → src/worker/auth/shared/channels.ts
diff --git a/src/providers/web_workers/ui/auth.ts → src/worker/auth/ui/auth.ts b/src/providers/web_workers/ui/auth.ts → src/worker/auth/ui/auth.ts
@@ -1,8 +1,8 @@
-import {Injectable, Inject} from '@angular/core';
-import {ServiceMessageBrokerFactory, PRIMITIVE} from '@angular/platform-browser/src/worker_render';
-import {AUTH_CHANNEL, INITIAL_AUTH_CHANNEL} from '../shared/channels';
-import {FirebaseAuthState} from '../../auth_backend';
-import {FirebaseSdkAuthBackend} from '../../firebase_sdk_auth_backend';
+import { Injectable, Inject } from '@angular/core';
+import { ServiceMessageBrokerFactory, PRIMITIVE } from '@angular/platform-browser/src/worker_render';
+import { AUTH_CHANNEL, INITIAL_AUTH_CHANNEL } from '../shared/channels';
+import { FirebaseAuthState } from '../../auth_backend';
+import { FirebaseSdkAuthBackend } from '../../firebase_sdk_auth_backend';
 
 @Injectable()
 export class MessageBasedFirebaseAuth {

diff --git a/src/providers/web_workers/worker/auth.ts → src/worker/auth/worker/auth.ts b/src/providers/web_workers/worker/auth.ts → src/worker/auth/worker/auth.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -21,8 +21,9 @@
     "src/database/firebase_list_observable.spec.ts",
     "src/database/firebase_object_observable.spec.ts",
     "src/database/query_observable.spec.ts",
-    "src/providers/auth.spec.ts",
-    "src/providers/auth_backend.spec.ts",
+    "src/auth/auth.ts",
+    "src/auth/auth.spec.ts",
+    "src/auth/auth_backend.spec.ts",
     "typings/main.d.ts",
     "manual_typings/firebase3/firebase3.d.ts"
   ]