Merge branch 'api-auth' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b into api-auth

1 files changed, 6 insertions, 4 deletions

diff --git a/ufund-ui/src/app/app.component.ts b/ufund-ui/src/app/app.component.ts
index a85d04b..6f4e1f5 100644
--- a/ufund-ui/src/app/app.component.ts
+++ b/ufund-ui/src/app/app.component.ts
@@ -1,7 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {UsersService} from './services/users.service';
-import {BehaviorSubject, Observable, Subject} from 'rxjs';
-import {User} from './models/User';
+import {BehaviorSubject} from 'rxjs';
 
 @Component({
   selector: 'app-root',
@@ -18,8 +17,11 @@ export class AppComponent implements OnInit {
     ) {}
 
     ngOnInit() {
-        this.userService.getCurrentUser().subscribe(r => {
-            this.currentUser$?.next("Logged in as " + r.username)
+        this.userService.getCurrentUserSubject().subscribe(r => {
+            this.currentUser$?.next(r
+                ? "Logged in as " + r.username
+                : "Logged out."
+            )
         })
     }