andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-24 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add project id on project grant (#202)

Browse Source 
* fix: add project id on project grant

* fix: get granted project grant member
This commit is contained in:
Fabi
2020-06-10 14:28:15 +02:00
committed by GitHub
parent 652a408c99
commit 9965beee9c
9 changed files with 649 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/management/api/grpc/management.pb.go
+619 -619
View File
File diff suppressed because it is too large Load Diff
pkg/management/api/grpc/management.swagger.json
+1 -1
View File
@@ -167,7 +167,7 @@
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/v1ProjectGrant"
"$ref": "#/definitions/v1GrantedProject"
}
}
},
pkg/management/api/grpc/project.go
+3 -3
View File
@@ -65,12 +65,12 @@ func (s *Server) ProjectByID(ctx context.Context, id *ProjectID) (*Project, erro
return projectFromModel(project), nil
}
func (s *Server) GetGrantedProjectGrantByID(ctx context.Context, in *ProjectGrantID) (*ProjectGrant, error) {
project, err := s.project.ProjectGrantByID(ctx, in.ProjectId, in.Id)
func (s *Server) GetGrantedProjectGrantByID(ctx context.Context, in *ProjectGrantID) (*GrantedProject, error) {
project, err := s.project.GetGrantedProjectGrantByIDs(ctx, in.ProjectId, in.Id)
if err != nil {
return nil, err
}
return projectGrantFromModel(project), nil
return grantedProjectFromModel(project), nil
}
func (s *Server) AddProjectRole(ctx context.Context, in *ProjectRoleAdd) (*ProjectRole, error) {
pkg/management/api/grpc/project_grant_converter.go
+1
View File
@@ -23,6 +23,7 @@ func projectGrantFromModel(grant *proj_model.ProjectGrant) *ProjectGrant {
GrantedOrgId: grant.GrantedOrgID,
RoleKeys: grant.RoleKeys,
Sequence: grant.Sequence,
ProjectId: grant.AggregateID,
}
}
pkg/management/api/proto/management.proto
+1 -1
View File
@@ -641,7 +641,7 @@ service ManagementService {
}
//GRANTED_PROJECT_GRANTS
rpc GetGrantedProjectGrantByID(ProjectGrantID) returns (ProjectGrant) {
rpc GetGrantedProjectGrantByID(ProjectGrantID) returns (GrantedProject) {
option (google.api.http) = {
get: "/grantedprojects/{project_id}/grants/{id}"
};