TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: project grants (#4031)

Browse Source 
* fix: filter granted memberships correctly

* fix: only show changes of granted project

* Apply suggestions from code review

Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com>

* Update internal/query/user_membership.go

Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com>

Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com>
This commit is contained in:
Livio Spring
2022-07-27 09:55:44 +02:00
committed by GitHub
parent c15577c1f9
commit 5bd9badbcf
14 changed files with 224 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
console/src/app/modules/changes/changes.component.ts
View File

@@ -19,6 +19,7 @@ export enum ChangeType {
USER = 'user',
ORG = 'org',
PROJECT = 'project',
PROJECT_GRANT= 'project-grant',
APP = 'app',
}
@@ -93,6 +94,9 @@ export class ChangesComponent implements OnInit, OnDestroy {
case ChangeType.PROJECT:
first = this.mgmtUserService.listProjectChanges(this.id, 30, 0);
break;
case ChangeType.PROJECT_GRANT:
first = this.mgmtUserService.listProjectGrantChanges(this.id, this.secId, 30, 0);
break;
case ChangeType.ORG:
first = this.mgmtUserService.listOrgChanges(30, 0);
break;
@@ -126,6 +130,9 @@ export class ChangesComponent implements OnInit, OnDestroy {
case ChangeType.PROJECT:
more = this.mgmtUserService.listProjectChanges(this.id, 20, cursor);
break;
case ChangeType.PROJECT_GRANT:
more = this.mgmtUserService.listProjectGrantChanges(this.id, this.secId, 20, cursor);
break;
case ChangeType.ORG:
more = this.mgmtUserService.listOrgChanges(20, cursor);
break;

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

@@ -54,7 +54,7 @@
</ng-template>
<div metainfo>
<cnsl-changes *ngIf="project" [changeType]="ChangeType.PROJECT" [id]="project.projectId"></cnsl-changes>
<cnsl-changes *ngIf="project" [changeType]="ChangeType.PROJECT_GRANT" [id]="project.projectId" [secId]="project.grantId"></cnsl-changes>
</div>
</cnsl-meta-layout>
</div>

24
console/src/app/services/mgmt.service.ts
View File

@@ -221,6 +221,8 @@ import {
ListPersonalAccessTokensResponse,
ListProjectChangesRequest,
ListProjectChangesResponse,
ListProjectGrantChangesRequest,
ListProjectGrantChangesResponse,
ListProjectGrantMemberRolesRequest,
ListProjectGrantMemberRolesResponse,
ListProjectGrantMembersRequest,
@@ -1776,6 +1778,28 @@ export class ManagementService {
return this.grpcService.mgmt.listProjectChanges(req, null).then((resp) => resp.toObject());
}
public listProjectGrantChanges(
projectId: string,
grantId: string,
limit: number,
sequence: number,
): Promise<ListProjectGrantChangesResponse.AsObject> {
const req = new ListProjectGrantChangesRequest();
req.setProjectId(projectId);
req.setGrantId(grantId);
const query = new ChangeQuery();
if (limit) {
query.setLimit(limit);
}
if (sequence) {
query.setSequence(sequence);
}
req.setQuery(query);
return this.grpcService.mgmt.listProjectGrantChanges(req, null).then((resp) => resp.toObject());
}
public listUserChanges(userId: string, limit: number, sequence: number): Promise<ListUserChangesResponse.AsObject> {
const req = new ListUserChangesRequest();
req.setUserId(userId);