Simplified login request data

Author: Bernardo-MG

src/app/authentication/model/login-status.ts

@@ -0,0 +1,3 @@
+export class LoginStatus {
+    username: string = '';
+}

src/app/authentication/model/user.ts

@@ -1,6 +1,5 @@
 export class User {
     username: string = '';
-    password: string = '';
     logged: boolean = false;
     token: string | null = null;
 }

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

@@ -4,44 +4,51 @@ import { Response } from '@app/api/model/response';
 import { environment } from '@environments/environment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { LoginStatus } from '../model/login-status';
 import { User } from '../model/user';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AuthenticationService {
 
+  private loginUrl = environment.apiUrl + "/fee";
+
   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 })
+  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 })
       .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;
-      }));
+      .pipe(map(toUser));
   }
 
-  logout() {
+  public logout() {
     this.user = new User();
   }
 
-  getUser(): User {
+  public getUser(): User {
+    return this.user;
+  }
+
+  private loadUser(username: string, password: string, status: LoginStatus): User {
+    let loggedUser;
+
+    loggedUser = new User();
+    if (status) {
+      loggedUser.username = status.username;
+      loggedUser.logged = true;
+
+      const token = window.btoa(username + ':' + password);
+      loggedUser.token = token;
+    }
+
+    this.user = loggedUser;
     return this.user;
   }
 

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

@@ -1 +1 @@
-<button (click)="logout()">Logout</button>
+<button (click)="onLogout()" [disabled]="!isAbleToLogout()">Logout</button>

…ogout-button/logout-button.component.css …gout-button/logout-button.component.sasssrc/app/login/logout-button/logout-button.component.css renamed to src/app/login/logout-button/logout-button.component.sass src/app/login/logout-button/logout-button.component.css renamed to src/app/login/logout-button/logout-button.component.sass

@@ -5,18 +5,24 @@ import { AuthenticationService } from '@app/authentication/service/authenticatio
 @Component({
   selector: 'logout-button',
   templateUrl: './logout-button.component.html',
-  styleUrls: ['./logout-button.component.css']
+  styleUrls: ['./logout-button.component.sass']
 })
 export class LogoutButtonComponent {
 
+  private loginUrl = '/login';
+
   constructor(
     private authenticationService: AuthenticationService,
     private router: Router
   ) { }
 
-  logout() {
+  public onLogout() {
     this.authenticationService.logout();
-    this.router.navigate(['/login']);
+    this.router.navigate([this.loginUrl]);
+  }
+
+  public isAbleToLogout(): boolean {
+    return this.authenticationService.getUser().logged;
   }
 
 }