TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 13:01:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mpa_contributing_20220530

Browse Source
This commit is contained in:
Elio Bischof
2022-08-25 21:23:58 +02:00
committed by GitHub
parent dfefd3085b 47930c6a85
commit 9fe22e67ac
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/auth/repository/eventsourcing/handler/user_external_idps.go
View File

@@ -109,7 +109,7 @@ func (i *ExternalIDP) processUser(event *es_models.Event) (err error) {
if err != nil { if err != nil {
return err return err
} }
return i.view.DeleteExternalIDP(externalIDP.ExternalUserID, externalIDP.IDPConfigID, externalIDP.InstanceID, event) return i.view.DeleteExternalIDP(externalIDP.ExternalUserID, externalIDP.IDPConfigID, event.InstanceID, event)
case user.UserRemovedType: case user.UserRemovedType:
return i.view.DeleteExternalIDPsByUserID(event.AggregateID, event.InstanceID, event) return i.view.DeleteExternalIDPsByUserID(event.AggregateID, event.InstanceID, event)
default: default:
@@ -125,13 +125,16 @@ func (i *ExternalIDP) processIdpConfig(event *es_models.Event) (err error) {
switch eventstore.EventType(event.Type) { switch eventstore.EventType(event.Type) {
case instance.IDPConfigChangedEventType, org.IDPConfigChangedEventType: case instance.IDPConfigChangedEventType, org.IDPConfigChangedEventType:
configView := new(iam_view_model.IDPConfigView) configView := new(iam_view_model.IDPConfigView)
config := new(query2.IDP) var config *query2.IDP
if eventstore.EventType(event.Type) == instance.IDPConfigChangedEventType { if eventstore.EventType(event.Type) == instance.IDPConfigChangedEventType {
configView.AppendEvent(iam_model.IDPProviderTypeSystem, event) err = configView.AppendEvent(iam_model.IDPProviderTypeSystem, event)
} else { } else {
configView.AppendEvent(iam_model.IDPProviderTypeOrg, event) err = configView.AppendEvent(iam_model.IDPProviderTypeOrg, event)
} }
exterinalIDPs, err := i.view.ExternalIDPsByIDPConfigID(configView.IDPConfigID, configView.InstanceID) if err != nil {
return err
}
exterinalIDPs, err := i.view.ExternalIDPsByIDPConfigID(configView.IDPConfigID, event.InstanceID)
if err != nil { if err != nil {
return err return err
} }
@@ -150,7 +153,6 @@ func (i *ExternalIDP) processIdpConfig(event *es_models.Event) (err error) {
default: default:
return i.view.ProcessedExternalIDPSequence(event) return i.view.ProcessedExternalIDPSequence(event)
} }
return nil
} }
func (i *ExternalIDP) fillData(externalIDP *usr_view_model.ExternalIDPView) error { func (i *ExternalIDP) fillData(externalIDP *usr_view_model.ExternalIDPView) error {

2
release-channels.yaml
View File

@@ -1 +1 @@
stable: "v2.0.1" stable: "v2.2.0"