Updated user service to use different endpoint

2021-09-09 14:41:02 +02:00
parent 6c9ff4423e
commit 8f3d1033a8
9 changed files with 43 additions and 47 deletions
@@ -14,9 +14,9 @@ export class RoleGuard implements CanActivate {
  canActivate(route: ActivatedRouteSnapshot): Observable<boolean> {
    const expectedRole: RoleEnum = route.data.expectedRole as RoleEnum;

-    return this.userService.user$.pipe(
-      filter(user => !!user),
-      map(({ roles }) => {
+    return this.userService.userRoles$.pipe(
+      filter(roles => !!roles?.length),
+      map(roles => {
        const userHasRole = roles.some(role => role.type === expectedRole);

        if (userHasRole) {