fix: auth guard
This commit is contained in:
@@ -16,7 +16,12 @@ export class APIService {
|
||||
constructor(private http: HttpClient){}
|
||||
|
||||
login(username: string, password: string): Observable<any>{
|
||||
return this.http.post(`${this.apiUrl}/auth/login`,{ 'username': username, 'password': password});
|
||||
return this.http.post(`${this.apiUrl}/auth/login`,{ 'username': username, 'password': password}).pipe(
|
||||
tap({
|
||||
next: () => this.isAuthenticatedSubject.next(true),
|
||||
error: () => this.isAuthenticatedSubject.next(false)
|
||||
})
|
||||
);
|
||||
}
|
||||
logout(): Observable<any>{
|
||||
return this.http.post(`${this.apiUrl}/auth/logout`, {});
|
||||
|
||||
@@ -7,8 +7,7 @@ export const authGuard: CanActivateFn = (route, state) => {
|
||||
const api = inject(APIService);
|
||||
const router = inject(Router);
|
||||
|
||||
//FIXME always redirected to login after page load
|
||||
return api.isAuthenticated$.pipe(
|
||||
return api.checkAuthStatus().pipe(
|
||||
map((isAuthenticated) => {
|
||||
if (isAuthenticated) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user