Refactor logout button display & handling of 401 responses

Author: netzartist

client/src/app/app.component.html

@@ -4,7 +4,7 @@
       <div class="logo">
         <h1>ODS Provisioning</h1>
       </div>
-      <div class="user-area" *ngIf="showLogoutButton()">
+      <div class="user-area" *ngIf="showLogoutButton">
         <div class="user-area__logout">
           <a
             mat-mini-fab

client/src/app/app.component.ts

@@ -22,6 +22,7 @@ export class AppComponent implements OnInit {
   isError: boolean;
   isNewProjectFormActive = false;
   hideSidebar = false;
+  showLogoutButton = true;
 
   projects: ProjectData[] = [];
 
@@ -55,24 +56,8 @@ export class AppComponent implements OnInit {
         this.isLoading = false;
       }
     });
-  }
 
-  private setSsoMode() {
-    this.authenticationService.sso = true;
-    this.router.navigate([], {
-      queryParams: {
-        sso: null
-      }
-    });
-  }
-
-  showLogoutButton() {
-    this.router.events.subscribe(event => {
-      if (event instanceof NavigationStart && (event.url === 'login' || event.url === 'logout')) {
-        return false;
-      }
-      return true;
-    });
+    this.checkShowLogoutButton();
   }
 
   getEditModeStatus() {
@@ -89,10 +74,29 @@ 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) {
       this.router.navigateByUrl(`/project/${projectKey}`);
+    } else {
+      this.router.navigateByUrl('/project');
     }
   }
 
@@ -106,13 +110,10 @@ export class AppComponent implements OnInit {
       .getAllProjects()
       .pipe(
         catchError((response: HttpErrorResponse) => {
-          if (response.error.status === 401) {
-            // interceptor takes control and redirects to login
-            return EMPTY;
-          }
           // show generic error page
           this.isLoading = false;
           this.isError = true;
+          return EMPTY;
         })
       )
       .subscribe((response: ProjectData[]) => {

client/src/app/modules/error-handler/http-request-interceptor.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
+import { EMPTY, Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { Router } from '@angular/router';
 import { AuthenticationService } from '../authentication/services/authentication.service';
@@ -42,6 +42,7 @@ export class HttpRequestInterceptor implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         if (error.status === 401) {
           this.router.navigateByUrl(this.authenticationService.sso ? '/' : '/login');
+          return EMPTY;
         }
 
         // TODO Improvement idea: