Refactor authService

Bezael · Bezael · commit dce77b973ba1 · 2020-09-26T13:06:02.000+02:00
diff --git a/src/app/pages/auth/auth.service.ts b/src/app/pages/auth/auth.service.ts
@@ -14,34 +14,25 @@ const helper = new JwtHelperService();
   providedIn: 'root',
 })
 export class AuthService {
-  private loggedIn = new BehaviorSubject<boolean>(false);
-  private role = new BehaviorSubject<Roles>(null);
-  private userToken = new BehaviorSubject<string>(null);
+  private user = new BehaviorSubject<UserResponse>(null);
+
   constructor(private http: HttpClient, private router: Router) {
     this.checkToken();
   }
-
-  get isLogged(): Observable<boolean> {
-    return this.loggedIn.asObservable();
+  get user$(): Observable<UserResponse> {
+    return this.user.asObservable();
   }
 
-  get isAdmin$(): Observable<string> {
-    return this.role.asObservable();
+  get userValue(): UserResponse {
+    return this.user.getValue();
   }
-
-  get userTokenValue(): string {
-    return this.userToken.getValue();
-  }
-
   login(authData: User): Observable<UserResponse | void> {
     return this.http
       .post<UserResponse>(`${environment.API_URL}/auth/login`, authData)
       .pipe(
         map((user: UserResponse) => {
           this.saveLocalStorage(user);
-          this.loggedIn.next(true);
-          this.role.next(user.role);
-          this.userToken.next(user.token);
+          this.user.next(user);
           return user;
         }),
         catchError((err) => this.handlerError(err))
@@ -50,9 +41,7 @@ export class AuthService {
 
   logout(): void {
     localStorage.removeItem('user');
-    this.loggedIn.next(false);
-    this.role.next(null);
-    this.userToken.next(null);
+    this.user.next(null);
     this.router.navigate(['/login']);
   }
 
@@ -65,9 +54,7 @@ export class AuthService {
       if (isExpired) {
         this.logout();
       } else {
-        this.loggedIn.next(true);
-        this.role.next(user.role);
-        this.userToken.next(user.token);
+        this.user.next(user);
       }
     }
   }
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
@@ -1,2 +1,2 @@
-<h1 *ngIf="authSvc.isLogged | async">Welcome, user</h1>
+<h1 *ngIf="authSvc.user$ | async">Welcome, user</h1>
 <p>home works!</p>
diff --git a/src/app/shared/components/header/header.component.ts b/src/app/shared/components/header/header.component.ts
@@ -1,3 +1,4 @@
+import { UserResponse } from './../../models/user.interface';
 import {
   Component,
   OnInit,
@@ -26,13 +27,12 @@ export class HeaderComponent implements OnInit, OnDestroy {
   constructor(private authSvc: AuthService) {}
 
   ngOnInit(): void {
-    this.authSvc.isLogged
+    this.authSvc.user$
       .pipe(takeUntil(this.destroy$))
-      .subscribe((res) => (this.isLogged = res));
-
-    this.authSvc.isAdmin$
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((res: Roles) => (this.isAdmin = res));
+      .subscribe((user: UserResponse) => {
+        this.isLogged = true;
+        this.isAdmin = user?.role;
+      });
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/shared/guards/check-login.guard.ts b/src/app/shared/guards/check-login.guard.ts
@@ -1,3 +1,4 @@
+import { UserResponse } from './../models/user.interface';
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
 import { Observable } from 'rxjs';
@@ -11,9 +12,9 @@ export class CheckLoginGuard implements CanActivate {
   constructor(private authSvc: AuthService) {}
 
   canActivate(): Observable<boolean> {
-    return this.authSvc.isLogged.pipe(
+    return this.authSvc.user$.pipe(
       take(1),
-      map((isLogged: boolean) => !isLogged)
+      map((user: UserResponse) => (!user ? true : false))
     );
   }
 }
diff --git a/src/app/shared/interceptors/admin-interceptor.ts b/src/app/shared/interceptors/admin-interceptor.ts
@@ -11,10 +11,10 @@ export class AdminInterceptor implements HttpInterceptor {
   constructor(private authSvc: AuthService) {}
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<any> {
     if (req.url.includes('users')) {
-      const authToken = this.authSvc.userTokenValue;
+      const userValue = this.authSvc.userValue;
       const authReq = req.clone({
         setHeaders: {
-          auth: authToken,
+          auth: userValue.token,
         },
       });
       return next.handle(authReq);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-<h1 *ngIf="authSvc.isLogged \| async">Welcome, user</h1>`
	`1`	`+<h1 *ngIf="authSvc.user$ \| async">Welcome, user</h1>`
`2`	`2`	`<p>home works!</p>`