mgr/dashboard: Introduce API HTTP interceptor to display notification…

…s for more errors than 401, 404 and 500.

Signed-off-by: Volker Theile <vtheile@suse.com>

src/pybind/mgr/dashboard/frontend/src/app/app.module.ts

@@ -10,6 +10,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { CephModule } from './ceph/ceph.module';
 import { CoreModule } from './core/core.module';
+import { ApiInterceptorService } from './shared/services/api-interceptor.service';
 import { AuthInterceptorService } from './shared/services/auth-interceptor.service';
 import { SharedModule } from './shared/shared.module';
 
@@ -39,6 +40,11 @@ export class CustomOption extends ToastOptions {
   ],
   exports: [SharedModule],
   providers: [
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: ApiInterceptorService,
+      multi: true
+    },
     {
       provide: HTTP_INTERCEPTORS,
       useClass: AuthInterceptorService,

src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.ts

@@ -0,0 +1,37 @@
+import {
+  HttpErrorResponse,
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest
+} from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+import 'rxjs/add/observable/throw';
+import 'rxjs/add/operator/catch';
+import { Observable } from 'rxjs/Observable';
+
+import { NotificationType } from '../enum/notification-type.enum';
+import { NotificationService } from './notification.service';
+
+@Injectable()
+export class ApiInterceptorService implements HttpInterceptor {
+  constructor(private router: Router,
+              public notificationService: NotificationService) {}
+
+  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    return next.handle(request).catch((resp) => {
+      if (resp instanceof HttpErrorResponse) {
+        if (resp.status === 404) {
+          this.router.navigate(['/404']);
+        }
+        this.notificationService.show(NotificationType.error,
+          resp.error.detail || '',
+          `${resp.status} - ${resp.statusText}`);
+      }
+      // Return the error to the method that called it.
+      return Observable.throw(resp);
+    });
+  }
+}

src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-interceptor.service.ts

@@ -12,41 +12,21 @@ import 'rxjs/add/observable/throw';
 import 'rxjs/add/operator/catch';
 import { Observable } from 'rxjs/Observable';
 
-import { NotificationType } from '../enum/notification-type.enum';
 import { AuthStorageService } from './auth-storage.service';
 import { NotificationService } from './notification.service';
 
 @Injectable()
 export class AuthInterceptorService implements HttpInterceptor {
-  constructor(
-    private router: Router,
-    private authStorageService: AuthStorageService,
-    public notificationService: NotificationService
-  ) {}
-
-  _notify (resp) {
-    this.notificationService.show(
-      NotificationType.error,
-      resp.error.detail || '',
-      `${resp.status} - ${resp.statusText}`
-    );
-  }
+  constructor(private router: Router,
+              private authStorageService: AuthStorageService,
+              public notificationService: NotificationService) {}
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    return next.handle(request).catch(resp => {
+    return next.handle(request).catch((resp) => {
       if (resp instanceof HttpErrorResponse) {
-        switch (resp.status) {
-          case 404:
-            this.router.navigate(['/404']);
-            break;
-          case 401:
-            this.authStorageService.remove();
-            this.router.navigate(['/login']);
-            this._notify(resp);
-            break;
-          case 500:
-            this._notify(resp);
-            break;
+        if (resp.status === 401) {
+          this.authStorageService.remove();
+          this.router.navigate(['/login']);
         }
       }
       // Return the error to the method that called it.