Parses response correctly

Author: Bernardo-MG

proxy.conf.json

@@ -1,10 +1,2 @@
 {
-    "/api": {
-        "target": "http://localhost:8080",
-        "secure": true,
-        "changeOrigin": true,
-        "pathRewrite": {
-            "^/api": ""
-        }
-    }
 }

src/app/api/model/pageable.ts

@@ -0,0 +1,10 @@
+import { Sort } from "./sort";
+
+export interface Pageable {
+    offset: number;
+    pageNumber: number;
+    pageSize: number;
+    paged: boolean;
+    sort: Sort;
+    unpaged: boolean;
+}

src/app/api/model/response.ts

@@ -0,0 +1,16 @@
+import { Pageable } from "./pageable";
+import { Sort } from "./sort";
+
+export interface Response<T> {
+    content: T;
+    empty: boolean;
+    first: boolean;
+    last: boolean;
+    number: number;
+    numberOfElements: number;
+    pageable: Pageable;
+    size: number;
+    sort: Sort;
+    totalElements: number;
+    totalPages: number;
+}

src/app/api/model/sort.ts

@@ -0,0 +1,5 @@
+export interface Sort {
+    empty: boolean;
+    sorted: boolean;
+    unsorted: boolean;
+}

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

@@ -4,43 +4,45 @@ import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { User } from '../model/user';
+import { Response } from '@app/api/model/response';
 
 @Injectable({
-    providedIn: 'root',
+  providedIn: 'root',
 })
 export class AuthenticationService {
 
-    public user: User = new User();
-    
-    constructor(
-      private http: HttpClient
-    ) { }
-  
-    login(username: string, password: string): Observable<User> {
-      return this.http.post<User>(`${environment.apiUrl}/auth/login/`, { username, password })
-        .pipe(map(user => {
-          let loggedUser;
-  
-          if (user) {
-            loggedUser = user;
-            const token = window.btoa(username + ':' + password);
-            loggedUser.logged = true;
-            loggedUser.token = token;
-          } else {
-            loggedUser = new User();
-          }
-  
-          this.user = loggedUser;
-          return this.user;
-        }));
-    }
-  
-    logout() {
-      this.user = new User();
-    }
-
-    getUser(): User {
+  public user: User = new User();
+
+  constructor(
+    private http: HttpClient
+  ) { }
+
+  login(username: string, password: string): Observable<User> {
+    return this.http.post<Response<User>>(`${environment.apiUrl}/login/`, { username, password })
+      .pipe(map(response => response.content))
+      .pipe(map(user => {
+        let loggedUser;
+
+        if (user) {
+          loggedUser = user;
+          const token = window.btoa(username + ':' + password);
+          loggedUser.logged = true;
+          loggedUser.token = token;
+        } else {
+          loggedUser = new User();
+        }
+
+        this.user = loggedUser;
         return this.user;
-    }
+      }));
+  }
+
+  logout() {
+    this.user = new User();
+  }
+
+  getUser(): User {
+    return this.user;
+  }
 
 }

src/app/login/login-form/login-form.component.ts

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { AuthenticationService } from '@app/authentication/service/authentication.service';
 
 @Component({
-  selector: 'dahs-login-form',
+  selector: 'login-form',
   templateUrl: './login-form.component.html',
   styleUrls: ['./login-form.component.sass']
 })

src/app/login/logout-button/logout-button.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { AuthenticationService } from '@app/authentication/service/authentication.service';
 
 @Component({
-  selector: 'dahs-logout-button',
+  selector: 'logout-button',
   templateUrl: './logout-button.component.html',
   styleUrls: ['./logout-button.component.css']
 })