fix: fix login/register
Some checks failed
CI / Get Changed Files (pull_request) Successful in 8s
CI / Checkstyle Main (pull_request) Has been skipped
CI / Docker backend validation (pull_request) Successful in 10s
CI / Docker frontend validation (pull_request) Successful in 36s
CI / oxlint (pull_request) Successful in 25s
CI / prettier (pull_request) Failing after 26s
CI / eslint (pull_request) Successful in 32s
CI / test-build (pull_request) Successful in 41s
Some checks failed
CI / Get Changed Files (pull_request) Successful in 8s
CI / Checkstyle Main (pull_request) Has been skipped
CI / Docker backend validation (pull_request) Successful in 10s
CI / Docker frontend validation (pull_request) Successful in 36s
CI / oxlint (pull_request) Successful in 25s
CI / prettier (pull_request) Failing after 26s
CI / eslint (pull_request) Successful in 32s
CI / test-build (pull_request) Successful in 41s
This commit is contained in:
parent
62e7e0ec65
commit
ad77c76d14
2 changed files with 14 additions and 33 deletions
|
@ -1,6 +1,6 @@
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import { HttpClient } from '@angular/common/http';
|
||||||
import { BehaviorSubject, Observable, tap } from 'rxjs';
|
import { BehaviorSubject, catchError, EMPTY, Observable, tap } from 'rxjs';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { LoginRequest } from '../model/auth/LoginRequest';
|
import { LoginRequest } from '../model/auth/LoginRequest';
|
||||||
import { RegisterRequest } from '../model/auth/RegisterRequest';
|
import { RegisterRequest } from '../model/auth/RegisterRequest';
|
||||||
|
@ -18,24 +18,23 @@ export class AuthService {
|
||||||
private authUrl = `${environment.apiUrl}/auth`;
|
private authUrl = `${environment.apiUrl}/auth`;
|
||||||
private userUrl = `${environment.apiUrl}/users`;
|
private userUrl = `${environment.apiUrl}/users`;
|
||||||
|
|
||||||
private currentUserSubject: BehaviorSubject<User | null>;
|
userSubject: BehaviorSubject<User | null>;
|
||||||
public currentUser: Observable<User | null>;
|
public currentUser: Observable<User | null>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private http: HttpClient,
|
private http: HttpClient,
|
||||||
private router: Router
|
private router: Router
|
||||||
) {
|
) {
|
||||||
this.currentUserSubject = new BehaviorSubject<User | null>(this.getUserFromStorage());
|
this.userSubject = new BehaviorSubject<User | null>(this.getUserFromStorage());
|
||||||
this.currentUser = this.currentUserSubject.asObservable();
|
this.currentUser = this.userSubject.asObservable().pipe(catchError(() => EMPTY));
|
||||||
|
|
||||||
// Check if token exists and load user data
|
|
||||||
if (this.getToken()) {
|
if (this.getToken()) {
|
||||||
this.loadCurrentUser();
|
this.loadCurrentUser();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public get currentUserValue(): User | null {
|
public get currentUserValue(): User | null {
|
||||||
return this.currentUserSubject.value;
|
return this.userSubject.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
login(loginRequest: LoginRequest): Observable<AuthResponse> {
|
login(loginRequest: LoginRequest): Observable<AuthResponse> {
|
||||||
|
@ -54,7 +53,7 @@ export class AuthService {
|
||||||
logout(): void {
|
logout(): void {
|
||||||
localStorage.removeItem(TOKEN_KEY);
|
localStorage.removeItem(TOKEN_KEY);
|
||||||
localStorage.removeItem(USER_KEY);
|
localStorage.removeItem(USER_KEY);
|
||||||
this.currentUserSubject.next(null);
|
this.userSubject.next(null);
|
||||||
this.router.navigate(['/']);
|
this.router.navigate(['/']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +82,7 @@ export class AuthService {
|
||||||
|
|
||||||
private setUser(user: User): void {
|
private setUser(user: User): void {
|
||||||
localStorage.setItem(USER_KEY, JSON.stringify(user));
|
localStorage.setItem(USER_KEY, JSON.stringify(user));
|
||||||
this.currentUserSubject.next(user);
|
this.userSubject.next(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
private getUserFromStorage(): User | null {
|
private getUserFromStorage(): User | null {
|
||||||
|
|
|
@ -1,16 +1,8 @@
|
||||||
import {
|
import { ChangeDetectionStrategy, Component, inject, OnDestroy, OnInit, signal } from '@angular/core';
|
||||||
ChangeDetectionStrategy,
|
|
||||||
Component,
|
|
||||||
inject,
|
|
||||||
OnDestroy,
|
|
||||||
OnInit,
|
|
||||||
signal,
|
|
||||||
} from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { AuthService } from '@service/auth.service';
|
import { AuthService } from '@service/auth.service';
|
||||||
import { Subscription } from 'rxjs';
|
import { Subscription } from 'rxjs';
|
||||||
import { AnimatedNumberComponent } from '@blackjack/components/animated-number/animated-number.component';
|
import { AnimatedNumberComponent } from '@blackjack/components/animated-number/animated-number.component';
|
||||||
import { UserService } from '@service/user.service';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-navbar',
|
selector: 'app-navbar',
|
||||||
|
@ -24,30 +16,20 @@ export class NavbarComponent implements OnInit, OnDestroy {
|
||||||
private authService: AuthService = inject(AuthService);
|
private authService: AuthService = inject(AuthService);
|
||||||
isLoggedIn = this.authService.isLoggedIn();
|
isLoggedIn = this.authService.isLoggedIn();
|
||||||
|
|
||||||
private userSubscription: Subscription | undefined;
|
private authSubscription!: Subscription;
|
||||||
private authSubscription: Subscription | undefined;
|
|
||||||
public balance = signal(0);
|
public balance = signal(0);
|
||||||
private userService = inject(UserService);
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
// Subscribe to auth changes
|
this.authSubscription = this.authService.userSubject.subscribe({
|
||||||
this.authSubscription = this.authService.currentUser.subscribe((user) => {
|
next: user => {
|
||||||
this.isLoggedIn = !!user;
|
|
||||||
this.balance.set(user?.balance ?? 0);
|
this.balance.set(user?.balance ?? 0);
|
||||||
console.log('Updated navbar balance:', user?.balance);
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
this.userService.refreshCurrentUser();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
if (this.userSubscription) {
|
|
||||||
this.userSubscription.unsubscribe();
|
|
||||||
}
|
|
||||||
if (this.authSubscription) {
|
|
||||||
this.authSubscription.unsubscribe();
|
this.authSubscription.unsubscribe();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
logout() {
|
logout() {
|
||||||
this.authService.logout();
|
this.authService.logout();
|
||||||
|
|
Reference in a new issue