diff --git a/src/app/@theme/components/header/header.component.html b/src/app/@theme/components/header/header.component.html index 41ff2ce6b6227cdb96361be8d38a7deef97165e2..4ebef15960d8ba8858cdff143ee646eeaa38c5e6 100644 --- a/src/app/@theme/components/header/header.component.html +++ b/src/app/@theme/components/header/header.component.html @@ -29,7 +29,7 @@ nbContextMenuTag="user-menu" [onlyPicture]="userPictureOnly" [name]="user?.preferred_username" - [title]="user?.realm_access?.roles.join(' | ')" + [title]="user?.roles.join(' | ')" [picture]="'assets/images/default_user.png'"> </nb-user> </nb-action> diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 29b4acef3f77d66270c726b14a2397d6ca9f82e5..b95f008cfeea78df5bde88b6f340fb5092c44168 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -11,7 +11,7 @@ export const routes: Routes = [ path: 'pages', loadChildren: () => import('./pages/pages.module') .then(m => m.PagesModule), - + canActivate: [AuthGuard] }, { path: 'auth', diff --git a/src/app/auth/oidc/oidc.ts b/src/app/auth/oidc/oidc.ts index 976b3b102133403d273d1cc8cb17075e246d6a83..7598356c2ab6d7e9162cb9edd2b0bc5d26a29aef 100644 --- a/src/app/auth/oidc/oidc.ts +++ b/src/app/auth/oidc/oidc.ts @@ -13,9 +13,7 @@ export interface UserClaims { picture: string; sub: string; updated_at: string; - realm_access: { - roles: string[]; - } + roles: string[]; } diff --git a/src/app/auth/services/oidc-user-information.service.ts b/src/app/auth/services/oidc-user-information.service.ts index 814917adbd30eea62984bf40be66e1d44e91e12c..53a1f8c7570c85061abbe5b5ae41c6490952d563 100644 --- a/src/app/auth/services/oidc-user-information.service.ts +++ b/src/app/auth/services/oidc-user-information.service.ts @@ -29,7 +29,7 @@ export class OidcUserInformationService { } getRole(): Observable<string[]> { - return this.user ? observableOf(this.user.realm_access.roles.map(role => role.toUpperCase())) : observableOf(['CITIZEN']); + return this.user ? observableOf(this.user.roles.map(role => role.toUpperCase())) : observableOf(['CITIZEN']); } getUser(): Observable<UserClaims> {