TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-03-01 01:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): user grant read check (#681)

Browse Source 
* fix: user grant read check

* fix guard

* rm console.logs
This commit is contained in:
Max Peintner 2020-09-01 16:23:24 +02:00 committed by GitHub
parent 0dd49f7430
commit 0d44b69c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/src/app/app-routing.module.ts
View File

@ -75,7 +75,7 @@ const routes: Routes = [
.then(m => m.UserGrantCreateModule), .then(m => m.UserGrantCreateModule),
canActivate: [RoleGuard], canActivate: [RoleGuard],
data: { data: {
roles: ['project.grant.user.grant.write'], roles: ['user.grant.write'],
}, },
}, },
{ {

6
console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.html
View File

@ -12,11 +12,11 @@
</div> </div>
</div> </div>
<ng-template appHasRole <ng-template appHasRole [appHasRole]="['user.grant.read', 'user.grant.read:'+grantId]">
[appHasRole]="['project.grant.user.grant.read', 'project.grant.user.grant.read:'+grantId]">
<app-card *ngIf="project?.projectId" title="{{ 'GRANTS.PROJECT.TITLE' | translate }}" <app-card *ngIf="project?.projectId" title="{{ 'GRANTS.PROJECT.TITLE' | translate }}"
description="{{'GRANTS.PROJECT.DESCRIPTION' | translate }}"> description="{{'GRANTS.PROJECT.DESCRIPTION' | translate }}">
<app-user-grants [context]="userGrantContext" [projectId]="projectId" [grantId]="grantId" <app-user-grants *ngIf="projectId && grantId" [context]="UserGrantContext.GRANTED_PROJECT"
[projectId]="projectId" [grantId]="grantId"
[displayedColumns]="['select','user', 'projectId', 'creationDate', 'changeDate', 'roleNamesList']" [displayedColumns]="['select','user', 'projectId', 'creationDate', 'changeDate', 'roleNamesList']"
[allowCreate]="['user.grant.write','user.grant.write:'+grantId] | hasRole | async" [allowCreate]="['user.grant.write','user.grant.write:'+grantId] | hasRole | async"
[allowDelete]="['user.grant.delete','user.grant.delete:'+grantId] | hasRole | async"> [allowDelete]="['user.grant.delete','user.grant.delete:'+grantId] | hasRole | async">

2
console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.ts
View File

@ -63,7 +63,7 @@ export class GrantedProjectDetailComponent implements OnInit, OnDestroy {
public isZitadel: boolean = false; public isZitadel: boolean = false;
public userGrantContext: UserGrantContext = UserGrantContext.GRANTED_PROJECT; UserGrantContext: any = UserGrantContext;
public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID; public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID;
// members // members

2
console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html
View File

@ -88,7 +88,7 @@
<ng-template appHasRole [appHasRole]="['user.grant.read']"> <ng-template appHasRole [appHasRole]="['user.grant.read']">
<app-card *ngIf="project?.projectId" title="{{ 'GRANTS.PROJECT.TITLE' | translate }}" <app-card *ngIf="project?.projectId" title="{{ 'GRANTS.PROJECT.TITLE' | translate }}"
description="{{'GRANTS.PROJECT.DESCRIPTION' | translate }}"> description="{{'GRANTS.PROJECT.DESCRIPTION' | translate }}">
<app-user-grants [context]="userGrantContext" [projectId]="projectId" <app-user-grants [context]="UserGrantContext.OWNED_PROJECT" [projectId]="projectId"
[allowCreate]="(['user.grant.write', 'user.grant.write:'+projectId] | hasRole) | async" [allowCreate]="(['user.grant.write', 'user.grant.write:'+projectId] | hasRole) | async"
[allowDelete]="(['user.grant.delete','user.grant.delete:'+projectId] | hasRole) | async"> [allowDelete]="(['user.grant.delete','user.grant.delete:'+projectId] | hasRole) | async">
</app-user-grants> </app-user-grants>

2
console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts
View File

@ -65,7 +65,7 @@ export class OwnedProjectDetailComponent implements OnInit, OnDestroy {
public isZitadel: boolean = false; public isZitadel: boolean = false;
public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID; public userGrantSearchKey: UserGrantSearchKey = UserGrantSearchKey.USERGRANTSEARCHKEY_PROJECT_ID;
public userGrantContext: UserGrantContext = UserGrantContext.OWNED_PROJECT; public UserGrantContext: any = UserGrantContext;
// members // members
public totalMemberResult: number = 0; public totalMemberResult: number = 0;

2
console/src/app/services/grpc-auth.service.ts
View File

@ -141,7 +141,7 @@ export class GrpcAuthService {
public hasRoles(userRoles: string[], requestedRoles: string[] | RegExp[]): boolean { public hasRoles(userRoles: string[], requestedRoles: string[] | RegExp[]): boolean {
return requestedRoles.findIndex((regexp: any) => { return requestedRoles.findIndex((regexp: any) => {
return userRoles.findIndex(role => { return userRoles.findIndex(role => {
return (new RegExp(regexp)).test(role); return new RegExp(regexp).test(role);
}) > -1; }) > -1;
}) > -1; }) > -1;
} }