Skip to content

Page can load without roles in local storage #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnKallies merged 2 commits into from
Feb 23, 2023
Merged

Page can load without roles in local storage #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8779652
Fix page cannot load on incognito mode
manuel-delvillar Feb 23, 2023
1424b24
Fix no roles
manuel-delvillar Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ui/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export class AppComponent extends Whitelabelled implements OnInit {
this.toastService.loaderSubject.subscribe(visible => {
this.blockingLoaderVisible = visible
})
this.validateRoles()
}

ngOnInit(): void {
Expand Down Expand Up @@ -75,4 +76,10 @@ export class AppComponent extends Whitelabelled implements OnInit {
}

}

validateRoles(): void {
if (this.authService.getRole() === null && this.authService.currentAuthToken()) {
this.router.navigate(["/logout"])
}
}
}
2 changes: 1 addition & 1 deletion ui/src/app/auth/auth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class AuthService extends Whitelabelled implements IAuthService {
if (ENABLE_ROLES) {
const allowedRoles = ActionByRoles.get(buttonAction) ?? [];
const userRoles = this.getRole()?.split(",");
return this.hasRole(allowedRoles, userRoles);
return this.hasRole(allowedRoles, userRoles ?? []);
}
return true;
}
Expand Down