fix(firebase): correct usage of FIREBASE_AUTH_OBJ_TS

Author: patrickmichalina

src/modules/firebase/auth/app.auth.module.ts

@@ -2,9 +2,11 @@ import { NgModule } from '@angular/core'
 import { AngularFireAuthModule } from 'angularfire2/auth'
 import { CookieService } from '../../cookies/browser'
 import { FirebaseUniversalAuthService } from './browser.auth.service'
+import { makeStateKey } from '@angular/platform-browser'
 import {
   FIREBASE_AUTH_COOKIE_STO_KEY,
-  FIREBASE_AUTH_COOKIE_FACTORY
+  FIREBASE_AUTH_COOKIE_FACTORY,
+  FIREBASE_AUTH_OBJ_TS
 } from './tokens'
 
 // tslint:disable:no-this
@@ -15,7 +17,8 @@ import {
   providers: [
     FirebaseUniversalAuthService,
     { provide: FIREBASE_AUTH_COOKIE_FACTORY, useClass: CookieService },
-    { provide: FIREBASE_AUTH_COOKIE_STO_KEY, useValue: 'firebaseJWT' }
+    { provide: FIREBASE_AUTH_COOKIE_STO_KEY, useValue: 'firebaseJWT' },
+    { provide: FIREBASE_AUTH_OBJ_TS, useValue: makeStateKey('fng.fb.auth.ts') }
   ]
 })
 export class FirebaseAuthAppModule {}

src/modules/firebase/auth/browser.ts

@@ -1 +1,2 @@
+export { FirebaseUniversalAuthService } from './browser.auth.service'
 export { FirebaseAuthBrowserModule } from './browser.auth.module'

src/modules/firebase/auth/server.auth.service.ts

@@ -6,7 +6,7 @@ import {
 import { auth } from 'firebase-admin'
 import { of } from 'rxjs'
 import { flatMap, catchError, map, tap } from 'rxjs/operators'
-import { TransferState } from '@angular/platform-browser'
+import { TransferState, StateKey } from '@angular/platform-browser'
 import { FIREBASE_AUTH_OBJ_TS } from './tokens'
 
 function validateToken(auth: auth.Auth, jwt: string) {
@@ -17,9 +17,9 @@ function byMappingItToUndefined(err: any) {
   return of(undefined)
 }
 
-function cacheToBrowser(ts: TransferState) {
+function cacheToBrowser(tsCacheKey: StateKey<any>, ts: TransferState) {
   return function(obj: any) {
-    ts.set(FIREBASE_AUTH_OBJ_TS, obj)
+    ts.set(tsCacheKey, obj)
   }
 }
 
@@ -42,6 +42,7 @@ function toPsuedoUserObject(jwtObj: any) {
 export class FirebaseServerAuth {
   constructor(
     private ts: TransferState,
+    @Inject(FIREBASE_AUTH_OBJ_TS) private tsCacheKey: StateKey<any>,
     @Inject(FIREBASE_AUTH_SERVER_ADMIN_APP) private authAdmin: auth.Auth,
     @Inject(FIREBASE_AUTH_SERVER_USER_JWT) private jwt: string
   ) {}
@@ -50,7 +51,7 @@ export class FirebaseServerAuth {
     ? validateToken(this.authAdmin, this.jwt).pipe(
         flatMap(a => a),
         map(toPsuedoUserObject),
-        tap(cacheToBrowser(this.ts)),
+        tap(cacheToBrowser(this.tsCacheKey, this.ts)),
         catchError(byMappingItToUndefined)
       )
     : of(null)

src/modules/firebase/auth/tokens.ts

@@ -1,11 +1,13 @@
 import { ICookieGetSet } from './app.common'
 import { InjectionToken } from '@angular/core'
-import { makeStateKey } from '@angular/platform-browser'
+import { StateKey } from '@angular/platform-browser'
 
 export const FIREBASE_AUTH_COOKIE_FACTORY = new InjectionToken<ICookieGetSet>(
   'fng.auth.ck.get.set'
 )
 export const FIREBASE_AUTH_COOKIE_STO_KEY = new InjectionToken<string>(
   'fng.auth.ck.sto'
 )
-export const FIREBASE_AUTH_OBJ_TS = makeStateKey('fng.fb.auth.ts')
+export const FIREBASE_AUTH_OBJ_TS = new InjectionToken<StateKey<any>>(
+  'fng.fb.auth.ts'
+)