chore(lint): Clean analytics + auth guard

Author: NothingEverHappens

src/analytics/analytics.module.ts

@@ -12,6 +12,7 @@ export class AngularFireAnalyticsModule {
     @Optional() userTracking: UserTrackingService
   ) {
     // calling anything on analytics will eagerly load the SDK
+    // tslint:disable-next-line:no-unused-expression
     analytics.app;
   }
 }

src/analytics/analytics.service.ts

@@ -29,6 +29,27 @@ const SCREEN_INSTANCE_DELIMITER = '#';
 
 const ANNOTATIONS = '__annotations__';
 
+
+// this is an INT64 in iOS/Android but use INT32 cause javascript
+let nextScreenInstanceID = Math.floor(Math.random() * (2 ** 32 - 1)) - 2 ** 31;
+
+const knownScreenInstanceIDs: { [key: string]: number } = {};
+
+const getScreenInstanceID = (params: { [key: string]: any }) => {
+  // unique the screen class against the outlet name
+  const screenInstanceKey = [
+    params[SCREEN_CLASS_KEY],
+    params[OUTLET_KEY]
+  ].join(SCREEN_INSTANCE_DELIMITER);
+  if (knownScreenInstanceIDs.hasOwnProperty(screenInstanceKey)) {
+    return knownScreenInstanceIDs[screenInstanceKey];
+  } else {
+    const ret = nextScreenInstanceID++;
+    knownScreenInstanceIDs[screenInstanceKey] = ret;
+    return ret;
+  }
+};
+
 @Injectable({
   providedIn: 'any'
 })
@@ -195,23 +216,3 @@ export class UserTrackingService implements OnDestroy {
     }
   }
 }
-
-// this is an INT64 in iOS/Android but use INT32 cause javascript
-let nextScreenInstanceID = Math.floor(Math.random() * (2 ** 32 - 1)) - 2 ** 31;
-
-const knownScreenInstanceIDs: { [key: string]: number } = {};
-
-const getScreenInstanceID = (params: { [key: string]: any }) => {
-  // unique the screen class against the outlet name
-  const screenInstanceKey = [
-    params[SCREEN_CLASS_KEY],
-    params[OUTLET_KEY]
-  ].join(SCREEN_INSTANCE_DELIMITER);
-  if (knownScreenInstanceIDs.hasOwnProperty(screenInstanceKey)) {
-    return knownScreenInstanceIDs[screenInstanceKey];
-  } else {
-    const ret = nextScreenInstanceID++;
-    knownScreenInstanceIDs[screenInstanceKey] = ret;
-    return ret;
-  }
-};

src/auth-guard/auth-guard.spec.ts

@@ -1,4 +1,4 @@
-import { inject, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { AngularFireModule, FirebaseApp } from '@angular/fire';
 import { COMMON_CONFIG } from '../test-config';
 import { AngularFireAuthGuard, AngularFireAuthGuardModule } from './public_api';
@@ -7,33 +7,32 @@ import { APP_BASE_HREF } from '@angular/common';
 import { rando } from '../firestore/utils.spec';
 
 describe('AngularFireAuthGuard', () => {
-    let app: FirebaseApp;
-    let router: Router;
+  let app: FirebaseApp;
+  let router: Router;
 
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                AngularFireModule.initializeApp(COMMON_CONFIG, rando()),
-                AngularFireAuthGuardModule,
-                RouterModule.forRoot([
-                    { path: 'a', redirectTo: '/', canActivate: [AngularFireAuthGuard] }
-                ])
-            ],
-            providers: [
-                { provide: APP_BASE_HREF, useValue: 'http://localhost:4200/' }
-            ]
-        });
-        inject([FirebaseApp, Router], (app_: FirebaseApp, router_: Router) => {
-            app = app_;
-            router = router_;
-        })();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        AngularFireModule.initializeApp(COMMON_CONFIG, rando()),
+        AngularFireAuthGuardModule,
+        RouterModule.forRoot([
+          { path: 'a', redirectTo: '/', canActivate: [AngularFireAuthGuard] }
+        ])
+      ],
+      providers: [
+        { provide: APP_BASE_HREF, useValue: 'http://localhost:4200/' }
+      ]
     });
 
-    afterEach(done => {
-        app.delete().then(done, done);
-    });
+    app = TestBed.inject(FirebaseApp);
+    router = TestBed.inject(Router);
+  });
 
-    it('should be injectable', () => {
-        expect(router).toBeTruthy();
-    });
+  afterEach(done => {
+    app.delete().then(done, done);
+  });
+
+  it('should be injectable', () => {
+    expect(router).toBeTruthy();
+  });
 });

src/auth-guard/auth-guard.ts

@@ -8,6 +8,8 @@ import { FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseAppConfig, FirebaseOptions
 export type AuthPipeGenerator = (next: ActivatedRouteSnapshot, state: RouterStateSnapshot) => AuthPipe;
 export type AuthPipe = UnaryFunction<Observable<User|null>, Observable<boolean|any[]>>;
 
+export const loggedIn: AuthPipe = map(user => !!user);
+
 @Injectable({
   providedIn: 'any'
 })
@@ -50,7 +52,7 @@ export const canActivate = (pipe: AuthPipeGenerator) => ({
     canActivate: [ AngularFireAuthGuard ], data: { authGuardPipe: pipe }
 });
 
-export const loggedIn: AuthPipe = map(user => !!user);
+
 export const isNotAnonymous: AuthPipe = map(user => !!user && !user.isAnonymous);
 export const idTokenResult = switchMap((user: User|null) => user ? user.getIdTokenResult() : of(null));
 export const emailVerified: AuthPipe = map(user => !!user && user.emailVerified);