#525 fix incorrect instanceof check and .json() transform

bwsw · Sep 15, 2017 · 5783047 · 5783047
1 parent d6672ae
commit 5783047
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { HttpResponse } from '@angular/common/http';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import '../style/app.scss';
@@ -54,7 +54,7 @@ export class AppComponent implements OnInit {
   }
 
   private handleError(e: any): void {
-    if (e instanceof HttpResponse) {
+    if (e instanceof HttpErrorResponse) {
       switch (e.status) {
         case 401:
           this.notification.message('AUTH.NOT_LOGGED_IN');

diff --git a/src/app/shared/services/base-backend.service.ts b/src/app/shared/services/base-backend.service.ts
@@ -124,9 +124,8 @@ export abstract class BaseBackendService<M extends BaseModel> {
     return result[responseKeys[0]];
   }
 
-
   protected postRequest(command: string, params?: {}): Observable<any> {
-    const headers = new HttpHeaders().set('Content-Type','application/x-www-form-urlencoded');
+    const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded');
     return this.http.post(BACKEND_API_URL, this.buildParams(command, params), { headers })
      .catch(error => this.handleError(error));
   }
@@ -196,9 +195,8 @@ export abstract class BaseBackendService<M extends BaseModel> {
     return apiCommand;
   }
 
-  private handleError(response): Observable<any> {
-    const error = response.json();
-    this.error.next(response);
+  private handleError(error: any): Observable<any> {
+    this.error.next(error);
     return Observable.throw(error);
   }