client/stillbox/src/app/login/auth.service.ts

@@ -1,4 +1,11 @@
-import { Injectable, signal, computed, effect, inject, DestroyRef } from '@angular/core';
+import {
+  Injectable,
+  signal,
+  computed,
+  effect,
+  inject,
+  DestroyRef,
+} from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Router } from '@angular/router';
 import { Observable, Subject } from 'rxjs';
@@ -68,25 +75,17 @@ export class AuthService {
   }
 
   _clearState() {
-this._state.update((state) => {
+    this._state.set(<AuthState>{});
-            state.is_auth = false;
-            state.token = null;
-            return state;
-          });
-
   }
 
   logout() {
-    console.log("logout!");
+    this.http.get('/api/logout', { withCredentials: true }).subscribe({
-    this.http
-      .get('/api/logout', { withCredentials: true})
-      .subscribe({
       next: (event) => {
         this._clearState();
       },
       error: (err) => {
         this._clearState();
-      }
+      },
     });
     this._router.navigateByUrl('/login');
   }
@@ -97,12 +96,14 @@ this._state.update((state) => {
       .pipe(
         tap((event) => {
           if (event.status == 200) {
+            let ost = this._state();
             let tok = event.body?.jwt.toString();
-            this._state.update((state) => {
+            let state = <AuthState>{
-              state.is_auth = true;
+              user: ost.user,
-              state.token = tok ? tok : null;
+              token: tok ? tok : null,
-              return state;
+              is_auth: true,
-            });
+            };
+            this._state.set(state);
           }
         }),
       );