aknuth/bizmatch-project
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects 5 Releases Wiki Activity

new initialization process, keycloak update 24.0.4

Browse Source
This commit is contained in:
Andreas Knuth
2024-05-20 15:54:01 -05:00
parent 747435bfba
commit dc9adb151d
30 changed files with 379 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bizmatch/src/app/guards/auth.guard.ts
View File

@@ -1,22 +1,30 @@
import { CanMatchFn, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
import { inject } from '@angular/core';
import { CanMatchFn, Router, UrlTree } from '@angular/router';
// Services
import { UserService } from '../services/user.service';
import { KeycloakInitializerService } from '../services/keycloak-initializer.service';
import { KeycloakService } from '../services/keycloak.service';
import { createLogger } from '../utils/utils';
const logger = createLogger('authGuard');
export const authGuard: CanMatchFn = async (route, segments): Promise<boolean | UrlTree> => {
const router = inject(Router);
const userService = inject(UserService);
const authenticated: boolean = userService.isLoggedIn();
const keycloakService = inject(KeycloakService);
const keycloakInitializer = inject(KeycloakInitializerService);
if (!keycloakInitializer.isInitialized()) {
await keycloakInitializer.initialize();
}
logger.info('###-> calling isLoggedIn()');
const authenticated = keycloakService.isLoggedIn();
if (!authenticated) {
console.log(window.location.origin)
console.log(window.location.href)
await userService.login(`${window.location.origin}${segments['url']}`);
console.log(window.location.origin);
console.log(window.location.href);
keycloakService.login({
redirectUri: `${window.location.origin}${segments['url']}`,
});
}
// Get the user Keycloak roles and the required from the route
const roles: string[] = userService.getUserRoles();//keycloakService.getUserRoles(true);
const roles: string[] = keycloakService.getUserRoles(true);
const requiredRoles = route.data?.['roles'];
// Allow the user to proceed if no additional roles are required to access the route
@@ -24,15 +32,11 @@ export const authGuard: CanMatchFn = async (route, segments): Promise<boolean |
return true;
}
// Allow the user to proceed if ALL of the required roles are present
const authorized = requiredRoles.every((role) => roles.includes(role));
// Allow the user to proceed if ONE of the required roles is present
//const authorized = requiredRoles.some((role) => roles.includes(role));
const authorized = requiredRoles.every(role => roles.includes(role));
if (authorized) {
return true;
}
// Display my custom HTTP 403 access denied page
return router.createUrlTree(['/access']);
};
return router.createUrlTree(['/home']);
};