Created login service

Author: Bernardo-MG

src/app/authentication/guard/logged-in.guard.spec.ts

@@ -1,4 +1,3 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { LoggedInGuard } from './logged-in.guard';
@@ -9,7 +8,6 @@ describe('LoggedInGuard', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        HttpClientTestingModule,
         RouterTestingModule
       ]
     });

src/app/authentication/guard/logged-in.guard.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
-import { AuthenticationService } from '../service/authentication.service';
+import { AuthenticationContainer } from '../service/authentication-container.service';
 
 /**
  * Logged in guard. Allows access only if the user in session is logged in. Otherwise redirects
@@ -16,13 +16,13 @@ export class LoggedInGuard implements CanActivate {
 
   constructor(
     private router: Router,
-    private authenticationService: AuthenticationService
+    private authenticationContainer: AuthenticationContainer
   ) { }
 
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    const logged = this.authenticationService.getUser().logged;
+    const logged = this.authenticationContainer.getLoginDetails().logged;
     let active;
 
     if (logged) {

src/app/authentication/guard/logged-out.guard.spec.ts

@@ -1,4 +1,3 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
@@ -10,7 +9,6 @@ describe('LoggedOutGuard', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        HttpClientTestingModule,
         RouterTestingModule
       ]
     });

src/app/authentication/guard/logged-out.guard.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
-import { AuthenticationService } from '../service/authentication.service';
+import { AuthenticationContainer } from '../service/authentication-container.service';
 
 /**
  * Logged out guard. Allows access only if the user in session is logged out. Otherwise redirects
@@ -16,13 +16,13 @@ export class LoggedOutGuard implements CanActivate {
 
   constructor(
     private router: Router,
-    private authenticationService: AuthenticationService
+    private authenticationContainer: AuthenticationContainer
   ) { }
 
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    const logged = this.authenticationService.getUser().logged;
+    const logged = this.authenticationContainer.getLoginDetails().logged;
     let active;
 
     if (logged) {

src/app/authentication/interceptor/basic-authentication.interceptor.spec.ts

@@ -1,13 +1,9 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { BasicAuthenticationInterceptor } from './basic-authentication.interceptor';
 
 describe('BasicAuthenticationInterceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({
-    imports: [
-      HttpClientTestingModule
-    ],
     providers: [
       BasicAuthenticationInterceptor
     ]

src/app/authentication/interceptor/basic-authentication.interceptor.ts

@@ -2,7 +2,7 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/c
 import { Injectable } from '@angular/core';
 import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
-import { AuthenticationService } from '../service/authentication.service';
+import { AuthenticationContainer } from '../service/authentication-container.service';
 
 /**
  * Basic HTTP authentication interceptor. Adds the basic authentication token to all request to
@@ -16,7 +16,7 @@ export class BasicAuthenticationInterceptor implements HttpInterceptor {
   private tokenHeaderIdentifier = 'Basic'
 
   constructor(
-    private authenticationService: AuthenticationService
+    private authenticationContainer: AuthenticationContainer
   ) { }
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
@@ -28,8 +28,8 @@ export class BasicAuthenticationInterceptor implements HttpInterceptor {
       // It is a request to our API
 
       // Acquire the current user token
-      const logged = this.authenticationService.getUser().logged;
-      const token = this.authenticationService.getUser().token;
+      const logged = this.authenticationContainer.getLoginDetails().logged;
+      const token = this.authenticationContainer.getLoginDetails().token;
 
       if ((logged) && (token)) {
         // Has token

src/app/authentication/interceptor/unauthorized.interceptor.spec.ts

@@ -1,13 +1,9 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { UnauthorizedErrorInterceptor } from './unauthorized.interceptor';
 
 describe('UnauthorizedErrorInterceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({
-    imports: [
-      HttpClientTestingModule
-    ],
     providers: [
       UnauthorizedErrorInterceptor
     ]

src/app/authentication/interceptor/unauthorized.interceptor.ts

@@ -2,7 +2,7 @@ import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/c
 import { Injectable } from '@angular/core';
 import { environment } from '@environments/environment';
 import { catchError, Observable, throwError } from 'rxjs';
-import { AuthenticationService } from '../service/authentication.service';
+import { AuthenticationContainer } from '../service/authentication-container.service';
 
 /**
  * Unauthorized error interceptor. Logs out the user in session on an authorization error.
@@ -11,7 +11,7 @@ import { AuthenticationService } from '../service/authentication.service';
 export class UnauthorizedErrorInterceptor implements HttpInterceptor {
 
   constructor(
-    private authenticationService: AuthenticationService
+    private authenticationContainer: AuthenticationContainer
   ) { }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
@@ -25,7 +25,7 @@ export class UnauthorizedErrorInterceptor implements HttpInterceptor {
         if (error.status === 401) {
           // Unauthenticated
           // Logs out
-          this.authenticationService.logout();
+          this.authenticationContainer.reset();
           location.reload();
         }
 

src/app/authentication/service/authentication-container.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthenticationContainer } from './authentication-container.service';
+
+describe('AuthenticationContainer', () => {
+  let service: AuthenticationContainer;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AuthenticationContainer);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/authentication/service/authentication-container.service.ts

@@ -0,0 +1,90 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { LoginDetails } from '../model/login-details';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AuthenticationContainer {
+
+  private userKey = 'user';
+
+  private loginDetailsSubject: BehaviorSubject<LoginDetails>;
+
+  private loginDetails: Observable<LoginDetails>;
+
+  constructor(
+  ) {
+    this.loginDetailsSubject = this.readUserFromLocal();
+    this.loginDetails = this.loginDetailsSubject.asObservable();
+  }
+
+  /**
+   * Reads the login status from the local storage. This allows recovering users stored as part of
+   * the 'remember me' functionality.
+   * 
+   * @returns the user stored in the local storage as part of the 'remember me'
+   */
+  private readUserFromLocal(): BehaviorSubject<LoginDetails> {
+    let subject: BehaviorSubject<LoginDetails>;
+
+    // If the user was stored, load it
+    const localUser = localStorage.getItem(this.userKey);
+    if (localUser) {
+      // User found in local storage
+      const readUser = JSON.parse(localUser);
+      subject = new BehaviorSubject<LoginDetails>(readUser);
+    } else {
+      // User not found
+      // Use default user
+      subject = new BehaviorSubject<LoginDetails>(new LoginDetails());
+    }
+
+    return subject;
+  }
+
+  /**
+   * Logs out the current user.
+   */
+  public reset() {
+    // Replace local data with empty login details
+    this.loginDetailsSubject.next(new LoginDetails());
+
+    // Clear local storage
+    localStorage.removeItem(this.userKey);
+  }
+
+  /**
+   * Returns the login details for the user currently in session.
+   * @returns the user currently in session
+   */
+  public getLoginDetails(): LoginDetails {
+    return this.loginDetailsSubject.value;
+  }
+
+  /**
+   * Returns the login details for the user currently in session as an observable. This allows reacting to new logins or logouts.
+   * 
+   * @returns the login details for the user currently in session as an observable
+   */
+  public getUserObservable(): Observable<LoginDetails> {
+    return this.loginDetails;
+  }
+
+  /**
+   * Stores the received login details. This takes two steps, first it is stored in the local
+   * subject. Then, if the 'remember me' option is enabled, it will be stored in the local storage.
+   * 
+   * @param loginDetails login details to store
+   */
+  public setLoginDetails(loginDetails: LoginDetails, rememberMe: Boolean) {
+    this.loginDetailsSubject.next(loginDetails);
+
+    if (rememberMe) {
+      // Store login details in the local storage
+      // This allows getting them back on a page reload
+      localStorage.setItem(this.userKey, JSON.stringify(loginDetails));
+    }
+  }
+
+}