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

fix: rename iam to instance (#3345)

Browse Source 
* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename iam command side to instance

* fix: rename orgiampolicy to domain policy

* fix: merge conflicts

* fix: protos

* fix: md files

* implement deprecated org iam policy again

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2022-03-24 17:21:34 +01:00
committed by GitHub
parent 504fe5b761
commit 9d4f296c62
274 changed files with 12073 additions and 11853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/org/model/org.go
View File

@@ -17,7 +17,7 @@ type Org struct {
Domains []*OrgDomain
Members []*OrgMember
OrgIamPolicy *iam_model.OrgIAMPolicy
DomainPolicy *iam_model.DomainPolicy
LoginPolicy *iam_model.LoginPolicy
LabelPolicy *iam_model.LabelPolicy
MailTemplate *iam_model.MailTemplate

24
internal/org/repository/eventsourcing/model/domain_policy.go Normal file
View File

@@ -0,0 +1,24 @@
package model
import (
es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
)
func (o *Org) appendAddDomainPolicyEvent(event *es_models.Event) error {
o.DomainPolicy = new(iam_es_model.DomainPolicy)
err := o.DomainPolicy.SetData(event)
if err != nil {
return err
}
o.DomainPolicy.ObjectRoot.CreationDate = event.CreationDate
return nil
}
func (o *Org) appendChangeDomainPolicyEvent(event *es_models.Event) error {
return o.DomainPolicy.SetData(event)
}
func (o *Org) appendRemoveDomainPolicyEvent() {
o.DomainPolicy = nil
}

18
internal/org/repository/eventsourcing/model/org.go
View File

@@ -23,7 +23,7 @@ type Org struct {
Domains []*OrgDomain `json:"-"`
Members []*OrgMember `json:"-"`
OrgIAMPolicy *iam_es_model.OrgIAMPolicy `json:"-"`
DomainPolicy *iam_es_model.DomainPolicy `json:"-"`
LabelPolicy *iam_es_model.LabelPolicy `json:"-"`
MailTemplate *iam_es_model.MailTemplate `json:"-"`
IDPs []*iam_es_model.IDPConfig `json:"-"`
@@ -42,8 +42,8 @@ func OrgToModel(org *Org) *org_model.Org {
Members: OrgMembersToModel(org.Members),
IDPs: iam_es_model.IDPConfigsToModel(org.IDPs),
}
if org.OrgIAMPolicy != nil {
converted.OrgIamPolicy = iam_es_model.OrgIAMPolicyToModel(org.OrgIAMPolicy)
if org.DomainPolicy != nil {
converted.DomainPolicy = iam_es_model.DomainPolicyToModel(org.DomainPolicy)
}
if org.LoginPolicy != nil {
converted.LoginPolicy = iam_es_model.LoginPolicyToModel(org.LoginPolicy)
@@ -134,12 +134,12 @@ func (o *Org) AppendEvent(event *es_models.Event) (err error) {
err = o.appendPrimaryDomainEvent(event)
case OrgDomainRemoved:
err = o.appendRemoveDomainEvent(event)
case OrgIAMPolicyAdded:
err = o.appendAddOrgIAMPolicyEvent(event)
case OrgIAMPolicyChanged:
err = o.appendChangeOrgIAMPolicyEvent(event)
case OrgIAMPolicyRemoved:
o.appendRemoveOrgIAMPolicyEvent()
case DomainPolicyAdded:
err = o.appendAddDomainPolicyEvent(event)
case DomainPolicyChanged:
err = o.appendChangeDomainPolicyEvent(event)
case DomainPolicyRemoved:
o.appendRemoveDomainPolicyEvent()
case IDPConfigAdded:
err = o.appendAddIDPConfigEvent(event)
case IDPConfigChanged:

24
internal/org/repository/eventsourcing/model/org_iam_policy.go
View File

@@ -1,24 +0,0 @@
package model
import (
es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
)
func (o *Org) appendAddOrgIAMPolicyEvent(event *es_models.Event) error {
o.OrgIAMPolicy = new(iam_es_model.OrgIAMPolicy)
err := o.OrgIAMPolicy.SetData(event)
if err != nil {
return err
}
o.OrgIAMPolicy.ObjectRoot.CreationDate = event.CreationDate
return nil
}
func (o *Org) appendChangeOrgIAMPolicyEvent(event *es_models.Event) error {
return o.OrgIAMPolicy.SetData(event)
}
func (o *Org) appendRemoveOrgIAMPolicyEvent() {
o.OrgIAMPolicy = nil
}

6
internal/org/repository/eventsourcing/model/types.go
View File

@@ -30,9 +30,9 @@ const (
OrgMemberRemoved models.EventType = "org.member.removed"
OrgMemberCascadeRemoved models.EventType = "org.member.cascade.removed"
OrgIAMPolicyAdded models.EventType = "org.iam.policy.added"
OrgIAMPolicyChanged models.EventType = "org.iam.policy.changed"
OrgIAMPolicyRemoved models.EventType = "org.iam.policy.removed"
DomainPolicyAdded models.EventType = "org.policy.domain.added"
DomainPolicyChanged models.EventType = "org.policy.domain.changed"
DomainPolicyRemoved models.EventType = "org.policy.domain.removed"
IDPConfigAdded models.EventType = "org.idp.config.added"
IDPConfigChanged models.EventType = "org.idp.config.changed"