Refactor SSO mode detection

Author: netzartist

client/src/app/app.component.ts

@@ -6,11 +6,10 @@ import { catchError } from 'rxjs/operators';
 import { EMPTY } from 'rxjs';
 import { EditModeFlag } from './modules/edit-mode/domain/edit-mode';
 import { StorageService } from './modules/storage/services/storage.service';
-import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
+import { NavigationStart, Router } from '@angular/router';
 import { ProjectService } from './modules/project/services/project.service';
 import { ProjectData, ProjectStorage } from './domain/project';
 import { AuthenticationService } from './modules/authentication/services/authentication.service';
-import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
   selector: 'app-root',
@@ -29,7 +28,6 @@ export class AppComponent implements OnInit {
   constructor(
     public editMode: EditModeService,
     public router: Router,
-    private activatedRoute: ActivatedRoute,
     private matIconRegistry: MatIconRegistry,
     private domSanitizer: DomSanitizer,
     private renderer: Renderer2,
@@ -42,22 +40,18 @@ export class AppComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.activatedRoute.queryParams.subscribe(params => {
-      if (params['sso']) {
-        this.setSsoMode();
-      }
-    });
+    this.authenticationService.checkAndSetSsoMode();
 
     this.router.events.subscribe(event => {
       if (event instanceof NavigationStart) {
         if (event.url === '/') {
           this.loadAllProjects();
+        } else if (event.url === '/login' || event.url === '/logout') {
+          this.showLogoutButton = false;
+          this.isLoading = false;
         }
-        this.isLoading = false;
       }
     });
-
-    this.checkShowLogoutButton();
   }
 
   getEditModeStatus() {
@@ -74,23 +68,6 @@ export class AppComponent implements OnInit {
     });
   }
 
-  private checkShowLogoutButton() {
-    return this.router.events.subscribe(event => {
-      if (event instanceof NavigationStart && (event.url === '/login' || event.url === '/logout')) {
-        this.showLogoutButton = false;
-      }
-    });
-  }
-
-  private setSsoMode() {
-    this.authenticationService.sso = true;
-    this.router.navigate([], {
-      queryParams: {
-        sso: null
-      }
-    });
-  }
-
   private checkRedirectToProjectDetail() {
     const projectKey = this.getProjectKeyFormStorage();
     if (projectKey) {
@@ -109,7 +86,7 @@ export class AppComponent implements OnInit {
     this.projectService
       .getAllProjects()
       .pipe(
-        catchError((response: HttpErrorResponse) => {
+        catchError(() => {
           // show generic error page
           this.isLoading = false;
           this.isError = true;

client/src/app/modules/authentication/services/authentication.service.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { API_AUTH_URL, API_LOGOUT_URL } from '../../../tokens';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Injectable({
   providedIn: 'root'
@@ -10,18 +11,25 @@ export class AuthenticationService {
 
   constructor(
     private httpClient: HttpClient,
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
     @Inject(API_AUTH_URL) private apiAuthUrl: string,
     @Inject(API_LOGOUT_URL) private apiLogoutUrl: string
   ) {}
 
-  set sso(enabled: boolean) {
-    this._sso = enabled;
-  }
-
   get sso(): boolean {
     return this._sso;
   }
 
+  checkAndSetSsoMode() {
+    this.activatedRoute.queryParams.subscribe(params => {
+      if (params['sso']) {
+        this._sso = true;
+        this.removeSsoUrlParam();
+      }
+    });
+  }
+
   login(username: string, password: string): any {
     const formData: FormData = new FormData();
     formData.append('username', username);
@@ -36,4 +44,12 @@ export class AuthenticationService {
   logout(): any {
     return this.httpClient.get<any>(this.apiLogoutUrl);
   }
+
+  private removeSsoUrlParam() {
+    this.router.navigate([], {
+      queryParams: {
+        sso: null
+      }
+    });
+  }
 }