User data is stored correctly

Author: Bernardo

src/app/authentication/model/user.ts

@@ -2,5 +2,6 @@ export class User {
     id: number = 0;
     username: string = '';
     password: string = '';
+    logged: boolean = false;
     authdata?: string;
 }

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

@@ -12,27 +12,33 @@ import { User } from '../model/user';
 export class AuthenticationService {
 
     private userSubject: BehaviorSubject<User>;
-    public user: Observable<User>;
 
     constructor(
         private router: Router,
         private http: HttpClient
     ) {
-        this.userSubject = new BehaviorSubject<User>(JSON.parse(<string>localStorage.getItem('user')));
-        this.user = this.userSubject.asObservable();
+        this.userSubject = new BehaviorSubject<User>(new User());
     }
 
-    public get userValue(): User {
+    public get user(): User {
         return this.userSubject.value;
     }
 
-    login(username: string, password: string) {
+    login(username: string, password: string): Observable<User> {
         return this.http.post<User>(`${environment.apiUrl}/login`, { username, password })
             .pipe(map(user => {
-                user.authdata = window.btoa(username + ':' + password);
-                localStorage.setItem('user', JSON.stringify(user));
-                this.userSubject.next(user);
-                return user;
+                let loggedUser;
+
+                if (user) {
+                    loggedUser = user;
+                    loggedUser.authdata = window.btoa(username + ':' + password);
+                    loggedUser.logged = true;
+                } else {
+                    loggedUser = new User();
+                }
+
+                this.userSubject.next(loggedUser);
+                return loggedUser;
             }));
     }
 

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

@@ -5,7 +5,7 @@ import { AuthenticationService } from '@app/authentication/service/authenticatio
 import { first } from 'rxjs/operators';
 
 @Component({
-  selector: 'app-login-form',
+  selector: 'dahs-login-form',
   templateUrl: './login-form.component.html',
   styleUrls: ['./login-form.component.sass']
 })
@@ -24,7 +24,7 @@ export class LoginFormComponent implements OnInit {
     private authenticationService: AuthenticationService
   ) {
     // redirect to home if already logged in
-    if (this.authenticationService.userValue) {
+    if (this.authenticationService.user.logged) {
       this.router.navigate(['/']);
     }
 
@@ -51,17 +51,19 @@ export class LoginFormComponent implements OnInit {
     }
 
     this.loading = true;
-    this.authenticationService.login(this.f.username.value, this.f.password.value)
-      .pipe(first())
-      .subscribe(
-        data => {
+    this.authenticationService.login(this.f['username'].value, this.f['password'].value)
+      .subscribe({
+        next: user => {
           this.loading = false;
-          this.router.navigate([this.returnUrl]);
+          if (user.logged) {
+            this.router.navigate([this.returnUrl]);
+          }
         },
-        error => {
+        error: error => {
           this.error = error;
           this.loading = false;
-        });
+        }
+      });
   }
 
 }