diff --git a/console/src/app/app-routing.module.ts b/console/src/app/app-routing.module.ts index 07cb9b6ce..ffd3c79a0 100644 --- a/console/src/app/app-routing.module.ts +++ b/console/src/app/app-routing.module.ts @@ -75,7 +75,7 @@ const routes: Routes = [ .then(m => m.UserGrantCreateModule), canActivate: [RoleGuard], data: { - roles: ['project.grant.user.grant.write'], + roles: ['user.grant.write'], }, }, { diff --git a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html index 98c9f6eac..b8c445290 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html +++ b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html @@ -12,11 +12,11 @@ - + - diff --git a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts index daf4edc5b..0c4cfa3b9 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts +++ b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts @@ -63,7 +63,7 @@ export class GrantedProjectDetailComponent implements OnInit, OnDestroy { public isZitadel: boolean = false; - public userGrantContext: UserGrantContext = UserGrantContext.GRANTED_PROJECT; + UserGrantContext: any = UserGrantContext; public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID; // members diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html index 4537449b6..ead04e8e7 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html @@ -88,7 +88,7 @@ - diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts index 8b67c8b75..d82dec56b 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts @@ -65,7 +65,7 @@ export class OwnedProjectDetailComponent implements OnInit, OnDestroy { public isZitadel: boolean = false; public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID; - public userGrantContext: UserGrantContext = UserGrantContext.OWNED_PROJECT; + public UserGrantContext: any = UserGrantContext; // members public totalMemberResult: number = 0; diff --git a/console/src/app/services/grpc-auth.service.ts b/console/src/app/services/grpc-auth.service.ts index 843fc7094..9936ba15e 100644 --- a/console/src/app/services/grpc-auth.service.ts +++ b/console/src/app/services/grpc-auth.service.ts @@ -141,7 +141,7 @@ export class GrpcAuthService { public hasRoles(userRoles: string[], requestedRoles: string[] | RegExp[]): boolean { return requestedRoles.findIndex((regexp: any) => { return userRoles.findIndex(role => { - return (new RegExp(regexp)).test(role); + return new RegExp(regexp).test(role); }) > -1; }) > -1; }