TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-02 06:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle domain claimed event correctly for service users (#1711)

Browse Source 
* fix: handle domain claimed event correctly on user view

* fix: ignore domain claimed events for email notifications

* fix: change org

* handle org changed in read models correctly

* fix: change org in user grant handler

Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
This commit is contained in:
Livio Amstutz
2021-05-04 14:57:11 +02:00
committed by GitHub
parent 87c1dfa3aa
commit bc633627c4
10 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/management/repository/eventsourcing/handler/org.go
View File

@@ -71,11 +71,7 @@ func (o *Org) Reduce(event *es_models.Event) (err error) {
case model.OrgAdded:
err = org.AppendEvent(event)
case model.OrgChanged:
err = org.SetData(event)
if err != nil {
return err
}
org, err = o.view.OrgByID(org.ID)
org, err = o.view.OrgByID(event.ResourceOwner)
if err != nil {
return err
}

27
internal/management/repository/eventsourcing/handler/user_grant.go
View File

@@ -59,7 +59,7 @@ func (u *UserGrant) ViewModel() string {
}
func (_ *UserGrant) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{grant_es_model.UserGrantAggregate, usr_es_model.UserAggregate, proj_es_model.ProjectAggregate}
return []es_models.AggregateType{grant_es_model.UserGrantAggregate, usr_es_model.UserAggregate, proj_es_model.ProjectAggregate, org_es_model.OrgAggregate}
}
func (u *UserGrant) CurrentSequence() (uint64, error) {
@@ -88,6 +88,8 @@ func (u *UserGrant) Reduce(event *es_models.Event) (err error) {
err = u.processUser(event)
case proj_es_model.ProjectAggregate:
err = u.processProject(event)
case org_es_model.OrgAggregate:
err = u.processOrg(event)
}
return err
}
@@ -171,6 +173,29 @@ func (u *UserGrant) processProject(event *es_models.Event) (err error) {
}
}
func (u *UserGrant) processOrg(event *es_models.Event) (err error) {
switch event.Type {
case org_es_model.OrgChanged:
grants, err := u.view.UserGrantsByOrgID(event.AggregateID)
if err != nil {
return err
}
if len(grants) == 0 {
return u.view.ProcessedUserGrantSequence(event)
}
org, err := u.getOrgByID(context.Background(), event.AggregateID)
if err != nil {
return err
}
for _, grant := range grants {
u.fillOrgData(grant, org)
}
return u.view.PutUserGrants(grants, event)
default:
return u.view.ProcessedUserGrantSequence(event)
}
}
func (u *UserGrant) fillData(grant *view_model.UserGrantView, resourceOwner string) (err error) {
user, err := u.getUserByID(grant.UserID)
if err != nil {