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

test: machine (#683)

Browse Source 
* test: machine

* test: better naming
This commit is contained in:
Silvan
2020-09-15 15:04:02 +02:00
committed by GitHub
parent 3e7cfcbca3
commit 71abc4f077
17 changed files with 548 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/project/repository/eventsourcing/eventstore.go
View File

@@ -839,14 +839,14 @@ func (es *ProjectEventstore) AddProjectGrant(ctx context.Context, grant *proj_mo
if grant == nil || !grant.IsValid() {
return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-37dhs", "Errors.Project.GrantInvalid")
}
existingProject, err := es.ProjectByID(ctx, grant.AggregateID)
project, err := es.ProjectByID(ctx, grant.AggregateID)
if err != nil {
return nil, err
}
if existingProject.ContainsGrantForOrg(grant.GrantedOrgID) {
if project.ContainsGrantForOrg(grant.GrantedOrgID) {
return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-7ug4g", "Errors.Project.GrantAlreadyExists")
}
if !existingProject.ContainsRoles(grant.RoleKeys) {
if !project.ContainsRoles(grant.RoleKeys) {
return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-di83d", "Errors.Project.GrantHasNotExistingRole")
}
id, err := es.idGenerator.Next()
@@ -855,7 +855,7 @@ func (es *ProjectEventstore) AddProjectGrant(ctx context.Context, grant *proj_mo
}
grant.GrantID = id
repoProject := model.ProjectFromModel(existingProject)
repoProject := model.ProjectFromModel(project)
repoGrant := model.GrantFromModel(grant)
addAggregate := ProjectGrantAddedAggregate(es.Eventstore.AggregateCreator(), repoProject, repoGrant)

4
internal/project/repository/eventsourcing/project.go
View File

@@ -368,12 +368,12 @@ func OIDCClientSecretCheckFailedAggregate(aggCreator *es_models.AggregateCreator
}
}
func ProjectGrantAddedAggregate(aggCreator *es_models.AggregateCreator, existingProject *model.Project, grant *model.ProjectGrant) func(ctx context.Context) (*es_models.Aggregate, error) {
func ProjectGrantAddedAggregate(aggCreator *es_models.AggregateCreator, project *model.Project, grant *model.ProjectGrant) func(ctx context.Context) (*es_models.Aggregate, error) {
return func(ctx context.Context) (*es_models.Aggregate, error) {
if grant == nil {
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-kd89w", "Errors.Internal")
}
agg, err := ProjectAggregate(ctx, aggCreator, existingProject)
agg, err := ProjectAggregate(ctx, aggCreator, project)
if err != nil {
return nil, err
}