fix: auth guard
This commit is contained in:
@@ -20,15 +20,15 @@ export class App implements OnInit{
|
||||
active = '/';
|
||||
|
||||
constructor(
|
||||
private router: Router
|
||||
private router: Router,
|
||||
){}
|
||||
|
||||
ngOnInit(): void {
|
||||
// show correct active tab
|
||||
this.router.events
|
||||
.pipe(filter(event => event instanceof NavigationEnd))
|
||||
.subscribe(() =>{
|
||||
this.active = this.router.url;
|
||||
console.log(this.active);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import { inject } from '@angular/core';
|
||||
import { CanActivateFn, Router } from '@angular/router';
|
||||
import { APIService } from './api';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { first, map } from 'rxjs/operators';
|
||||
|
||||
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(
|
||||
first(),
|
||||
map((isAuthenticated) => {
|
||||
if (isAuthenticated) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user