Renamed auth container

Author: Bernardo-MG

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

@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-container.service';
 import { LoggedInGuard } from './logged-in.guard';
 
 describe('LoggedInGuard', () => {
@@ -12,7 +12,7 @@ describe('LoggedInGuard', () => {
         RouterTestingModule
       ],
       providers: [
-        AuthenticationContainer
+        SecurityContainer
       ]
     });
     guard = TestBed.inject(LoggedInGuard);

src/app/core/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 { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-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 authenticationContainer: AuthenticationContainer
+    private securityContainer: SecurityContainer
   ) { }
 
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    const logged = this.authenticationContainer.getUserStatus().logged;
+    const logged = this.securityContainer.getStatus().logged;
     let active;
 
     if (logged) {

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

@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-container.service';
 import { LoggedOutGuard } from './logged-out.guard';
 
 describe('LoggedOutGuard', () => {
@@ -12,7 +12,7 @@ describe('LoggedOutGuard', () => {
         RouterTestingModule
       ],
       providers: [
-        AuthenticationContainer
+        SecurityContainer
       ]
     });
     guard = TestBed.inject(LoggedOutGuard);

src/app/core/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 { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-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 authenticationContainer: AuthenticationContainer
+    private securityContainer: SecurityContainer
   ) { }
 
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    const logged = this.authenticationContainer.getUserStatus().logged;
+    const logged = this.securityContainer.getStatus().logged;
     let active;
 
     if (logged) {

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

@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
-import { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-container.service';
 import { BasicAuthenticationInterceptor } from './basic-authentication.interceptor';
 
 describe('BasicAuthenticationInterceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({
     providers: [
       BasicAuthenticationInterceptor,
-      AuthenticationContainer
+      SecurityContainer
     ]
   }));
 

src/app/core/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 { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-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 authenticationContainer: AuthenticationContainer
+    private securityContainer: SecurityContainer
   ) { }
 
   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.authenticationContainer.getUserStatus().logged;
-      const token = this.authenticationContainer.getUserStatus().token;
+      const logged = this.securityContainer.getStatus().logged;
+      const token = this.securityContainer.getStatus().token;
 
       if ((logged) && (token)) {
         // Has token

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

@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
-import { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-container.service';
 import { UnauthorizedErrorInterceptor } from './unauthorized.interceptor';
 
 describe('UnauthorizedErrorInterceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({
     providers: [
       UnauthorizedErrorInterceptor,
-      AuthenticationContainer
+      SecurityContainer
     ]
   }));
 

src/app/core/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 { Observable, catchError, throwError } from 'rxjs';
-import { AuthenticationContainer } from '../services/authentication-container.service';
+import { SecurityContainer } from '../services/security-container.service';
 
 /**
  * Unauthorized error interceptor. Logs out the user in session on an authorization error.
@@ -11,7 +11,7 @@ import { AuthenticationContainer } from '../services/authentication-container.se
 export class UnauthorizedErrorInterceptor implements HttpInterceptor {
 
   constructor(
-    private authenticationContainer: AuthenticationContainer
+    private securityContainer: SecurityContainer
   ) { }
 
   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.authenticationContainer.reset();
+          this.securityContainer.reset();
           location.reload();
         }
 

…core/authentication/model/user-status.ts …/authentication/model/security-status.tssrc/app/core/authentication/model/user-status.ts renamed to src/app/core/authentication/model/security-status.ts src/app/core/authentication/model/user-status.ts renamed to src/app/core/authentication/model/security-status.ts

@@ -1,7 +1,7 @@
 /**
- * Status after a login attempt.
+ * Security status for a user.
  */
-export class UserStatus {
+export class SecurityStatus {
     /**
      * User username.
      */
@@ -11,7 +11,7 @@ export class UserStatus {
      */
     logged = false;
     /**
-     * Authentication token for the user. Only generated on a succesful login.
+     * Authentication token for the user.
      */
     token?: string;
 }