Improved request error handling

Author: Bernardo-MG

src/app/api/model/api-response.ts

@@ -0,0 +1,8 @@
+export class ApiResponse<T> {
+
+    constructor(cont: T) {
+        this.content = cont;
+    }
+
+    content: T;
+}

src/app/api/model/response.ts

@@ -1,9 +1,9 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Response } from '@app/api/model/response';
+import { ApiResponse } from '@app/api/model/api-response';
 import { environment } from '@environments/environment';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, throwError } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 import { LoginStatus } from '../model/login-status';
 import { User } from '../model/user';
 
@@ -23,7 +23,8 @@ export class AuthenticationService {
   public login(username: string, password: string): Observable<User> {
     const toUser = (status: LoginStatus) => this.loadUser(username, password, status);
 
-    return this.http.post<Response<LoginStatus>>(this.loginUrl, { username, password })
+    return this.http.post<ApiResponse<LoginStatus>>(this.loginUrl, { username, password })
+      .pipe(catchError(this.handleError))
       .pipe(map(response => response.content))
       .pipe(map(toUser));
   }
@@ -52,4 +53,8 @@ export class AuthenticationService {
     return this.user;
   }
 
+  private handleError(error: HttpErrorResponse) {
+    return throwError(() => new Error(error.message));
+  }
+
 }

src/app/authentication/service/authentication.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Response } from '@app/api/model/response';
+import { ApiResponse } from '@app/api/model/api-response';
 import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -14,7 +14,7 @@ export class DataService {
     ) { }
 
   getData(): Observable<Data[]> {
-    return this.http.get<Response<Data[]>>(`${environment.apiUrl}/rest/entity/`)
+    return this.http.get<ApiResponse<Data[]>>(`${environment.apiUrl}/rest/entity/`)
       .pipe(map(response => response.content));
   }
 

src/app/data/service/data.service.ts

@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthenticationService } from '@app/authentication/service/authentication.service';