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

fix: es bugs (#1455)

Browse Source 
* fix app key writemodel

* fix: add events to query

* fix: tests

* add missing project_grant_id to usergrant in proto

* fix IDPOwnerTypeQueryToModel

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2021-03-23 15:08:49 +01:00
committed by GitHub
parent 7768759906
commit ad43a10f65
9 changed files with 134 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
internal/api/grpc/user/user_grant.go
View File

@@ -17,20 +17,21 @@ func UserGrantsToPb(grants []*usr_grant_model.UserGrantView) []*user_pb.UserGran
func UserGrantToPb(grant *usr_grant_model.UserGrantView) *user_pb.UserGrant {
return &user_pb.UserGrant{
GrantId: grant.ID,
UserId: grant.UserID,
State: ModelUserGrantStateToPb(grant.State),
RoleKeys: grant.RoleKeys,
UserName: grant.UserName,
FirstName: grant.FirstName,
LastName: grant.LastName,
Email: grant.Email,
DisplayName: grant.DisplayName,
OrgId: grant.ResourceOwner,
OrgDomain: grant.OrgPrimaryDomain,
OrgName: grant.OrgName,
ProjectId: grant.ProjectID,
ProjectName: grant.ProjectName,
GrantId: grant.ID,
UserId: grant.UserID,
State: ModelUserGrantStateToPb(grant.State),
RoleKeys: grant.RoleKeys,
UserName: grant.UserName,
FirstName: grant.FirstName,
LastName: grant.LastName,
Email: grant.Email,
DisplayName: grant.DisplayName,
OrgId: grant.ResourceOwner,
OrgDomain: grant.OrgPrimaryDomain,
OrgName: grant.OrgName,
ProjectId: grant.ProjectID,
ProjectName: grant.ProjectName,
ProjectGrantId: grant.GrantID,
Details: object.ToViewDetailsPb(
grant.Sequence,
grant.CreationDate,