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: handle default org id (#3769)

Browse Source
This commit is contained in:
Livio Amstutz
2022-06-03 14:30:39 +02:00
committed by GitHub
parent ebb73186b6
commit 0baaaf8a05
38 changed files with 331 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/command/instance_model.go
View File

@@ -15,7 +15,7 @@ type InstanceWriteModel struct {
State domain.InstanceState
GeneratedDomain string
GlobalOrgID string
DefaultOrgID string
ProjectID string
DefaultLanguage language.Tag
}
@@ -46,8 +46,8 @@ func (wm *InstanceWriteModel) Reduce() error {
wm.GeneratedDomain = e.Domain
case *instance.ProjectSetEvent:
wm.ProjectID = e.ProjectID
case *instance.GlobalOrgSetEvent:
wm.GlobalOrgID = e.OrgID
case *instance.DefaultOrgSetEvent:
wm.DefaultOrgID = e.OrgID
case *instance.DefaultLanguageSetEvent:
wm.DefaultLanguage = e.Language
}
@@ -68,7 +68,7 @@ func (wm *InstanceWriteModel) Query() *eventstore.SearchQueryBuilder {
instance.InstanceDomainAddedEventType,
instance.InstanceDomainRemovedEventType,
instance.ProjectSetEventType,
instance.GlobalOrgSetEventType,
instance.DefaultOrgSetEventType,
instance.DefaultLanguageSetEventType).
Builder()
}