fix: linting, firebase imports

Splaktar · Splaktar · commit 110acfd4f19b · 2019-06-21T20:40:59.000-04:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devintent/angular-example",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "UNLICENSED",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "start:sw": "http-server dist/ -p 4200 -o",
     "start:prod": "ng serve --prod",
     "deploy": "firebase deploy --project prod",
-    "lint": "ng lint --type-check",
+    "lint": "ng lint",
     "ng": "ng",
     "smex": "source-map-explorer",
     "stylelint": "stylelint 'src/**/*.scss' --config stylelint-config.json --syntax scss",
diff --git a/src/app/api.service.ts b/src/app/api.service.ts
@@ -3,15 +3,15 @@ import {HttpHeaders} from '@angular/common/http';
 import {Observer} from 'rxjs/Observer';
 import {Observable} from 'rxjs/Observable';
 import {AngularFireAuth} from '@angular/fire/auth';
-import * as firebase from 'firebase/app';
+import {User} from 'firebase/app';
 
 @Injectable()
 export class ApiService {
   public idTokenObservable: Observable<string>;
 
   constructor(private fbAuth: AngularFireAuth) {
-    this.idTokenObservable = Observable.create((observer: Observer<string>) => {
-      this.fbAuth.authState.subscribe((authState: firebase.User) => {
+    this.idTokenObservable = new Observable((observer: Observer<string>) => {
+      this.fbAuth.authState.subscribe((authState: User) => {
         if (authState) {
           authState.getIdToken().then((token: string) => {
             observer.next(token);
diff --git a/src/app/users.service.ts b/src/app/users.service.ts
@@ -2,7 +2,6 @@ import {Injectable} from '@angular/core';
 import {Subscription} from 'rxjs/Subscription';
 import {AngularFireDatabase, AngularFireObject} from '@angular/fire/database';
 import {AngularFireAuth} from '@angular/fire/auth';
-import * as firebase from 'firebase/app';
 import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router';
 import {GoogleAnalyticsService} from './google-analytics.service';
 import {FullStoryService} from './fullstory.service';
@@ -11,16 +10,17 @@ import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {Observable} from 'rxjs/Observable';
 import {CodeConfirmationDialog} from './code-confirmation-dialog/code-confirmation.dialog';
 import {MatDialog} from '@angular/material/dialog';
+import {auth, User as FirebaseUser} from 'firebase/app';
 
 @Injectable()
 export class UsersService implements CanActivate {
   private adminSubscription: Subscription;
   private userSubscription: Subscription;
-  public authState: firebase.User;
+  public authState: FirebaseUser;
   public isLoggedIn: boolean = false;
   public isAdmin: boolean = false;
   public currentUser: User;
-  private userBehaviorSubject: BehaviorSubject<User>;
+  private readonly userBehaviorSubject: BehaviorSubject<User>;
   public firebaseUserObservable: Observable<User>;
   public firebaseUser: AngularFireObject<User>;
 
@@ -32,7 +32,7 @@ export class UsersService implements CanActivate {
     this.userBehaviorSubject = new BehaviorSubject(null);
     this.handleRedirect();
 
-    this.fbAuth.authState.subscribe((authState: firebase.User) => {
+    this.fbAuth.authState.subscribe((authState: FirebaseUser) => {
       this.authState = authState;
 
       if (authState) {
@@ -60,7 +60,7 @@ export class UsersService implements CanActivate {
   login(): void {
     this.gaService.sendEvent('accounts', 'login');
     if (this.authState && this.authState.isAnonymous) {
-      this.fbAuth.auth.currentUser.linkWithRedirect(new firebase.auth.GoogleAuthProvider())
+      this.fbAuth.auth.currentUser.linkWithRedirect(new auth.GoogleAuthProvider())
       .catch((error: any) => {
         if (error.credential) {
           this.signInWithCredential(error.credential);
@@ -70,7 +70,7 @@ export class UsersService implements CanActivate {
         }
       });
     } else {
-      this.fbAuth.auth.signInWithRedirect(new firebase.auth.GoogleAuthProvider())
+      this.fbAuth.auth.signInWithRedirect(new auth.GoogleAuthProvider())
       .catch((error) => {
         console.error(`signInWithRedirect failed: ${JSON.stringify(error)}`);
         this.gaService.sendEvent('accounts', 'signInWithRedirect_failure');
@@ -95,7 +95,7 @@ export class UsersService implements CanActivate {
     });
   }
 
-  signInWithCredential(credential: firebase.auth.AuthCredential): void {
+  signInWithCredential(credential: auth.AuthCredential): void {
     this.fbAuth.auth.signInWithCredential(credential)
     .catch((signInError) => {
       console.error(`signInWithCredential failed: ${JSON.stringify(signInError)}`);
@@ -114,11 +114,11 @@ export class UsersService implements CanActivate {
     });
   }
 
-  private setCurrentLoggedInUser(authState: firebase.User) {
+  private setCurrentLoggedInUser(authState: FirebaseUser) {
     this.isLoggedIn = !!authState && !authState.isAnonymous;
     this.gaService.setUserId(authState.uid);
     this.fullStoryService.setUser(authState.uid,
-      authState.displayName || 'Anonymous', authState.email || 'anonymous@marketamplified.com');
+      authState.displayName || 'Anonymous', authState.email || 'anonymous@devintent.com');
 
     if (!authState.isAnonymous) {
       this.firebaseUser = this.db.object<User>('/users/' + authState.uid);
@@ -196,11 +196,7 @@ export class UsersService implements CanActivate {
     const isAdminObservable: Observable<any> = this.db.object('/admins/' + user.uid).valueChanges();
     this.adminSubscription = isAdminObservable.subscribe(
       data => {
-        if (data) {
-          this.isAdmin = true;
-        } else {
-          this.isAdmin = false;
-        }
+        this.isAdmin = !!data;
       },
       err => {
         console.error('Failed to read from ' + '/admins/' + user.uid + ': ' + err);
diff --git a/src/index.html b/src/index.html
@@ -113,7 +113,7 @@
       <div class="toolbarShell"></div>
       <div class="container">
         <div class="feature-image-wrapper">
-          <img src="assets/images/Market_Amplified_logo_teal.svg"/>
+          <img src="assets/images/Market_Amplified_logo_teal.svg" alt="teal logo"/>
         </div>
       </div>
       <span class="loadingMsg">Loading...</span>
diff --git a/src/styles.scss b/src/styles.scss
@@ -33,6 +33,6 @@
     height: 400px;
   }
 }
-input[type="search"] {
+input[type='search'] {
   -webkit-appearance: textfield;
 }
diff --git a/tslint.json b/tslint.json
@@ -96,7 +96,6 @@
         "variable-declaration": "nospace"
       }
     ],
-    "typeof-compare": true,
     "unified-signatures": true,
     "variable-name": false,
     "whitespace": [

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@`
`33`	`33`	`height: 400px;`
`34`	`34`	`}`
`35`	`35`	`}`
`36`		`-input[type="search"] {`
	`36`	`+input[type='search'] {`
`37`	`37`	`-webkit-appearance: textfield;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@`
`96`	`96`	`"variable-declaration": "nospace"`
`97`	`97`	`}`
`98`	`98`	`],`
`99`		`- "typeof-compare": true,`
`100`	`99`	`"unified-signatures": true,`
`101`	`100`	`"variable-name": false,`
`102`	`101`	`"whitespace": [`