From cb8e6c9f24bec946570a5a91bedf315697e147cc Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Thu, 25 Aug 2022 11:17:47 +0200 Subject: [PATCH 1/3] chore: update stable to 2.2.0 (#4246) --- release-channels.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-channels.yaml b/release-channels.yaml index 77df68d894..8198dd7c97 100644 --- a/release-channels.yaml +++ b/release-channels.yaml @@ -1 +1 @@ -stable: "v2.0.1" +stable: "v2.2.0" From 14124c6e38cb21da94d0b174608d846acaf5af1e Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Thu, 25 Aug 2022 13:56:27 +0200 Subject: [PATCH 2/3] ci: delete environment.json (#4239) * Delete environment.json * Update .gitignore --- console/src/assets/.gitignore | 2 +- console/src/assets/environment.json | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 console/src/assets/environment.json diff --git a/console/src/assets/.gitignore b/console/src/assets/.gitignore index db5241c407..405af88d95 100644 --- a/console/src/assets/.gitignore +++ b/console/src/assets/.gitignore @@ -1,3 +1,3 @@ # environment.json should be dynamically fetched # e.g. curl http://localhost:4200/assets/environment.json > ./src/assets/environment.json -# environment.json +environment.json diff --git a/console/src/assets/environment.json b/console/src/assets/environment.json deleted file mode 100644 index 26dc1a2b62..0000000000 --- a/console/src/assets/environment.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "api": "https://bringmos-jv1jqo.zitadel.app", - "issuer": "https://bringmos-jv1jqo.zitadel.app", - "clientid": "163706959596355841@zitadel", - "customer_portal": "https://zitadel.cloud" -} From 47930c6a85bdb8fec3547bdee3e41b0f027fe019 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Thu, 25 Aug 2022 15:38:35 +0200 Subject: [PATCH 3/3] fix: handle instanceID correctly in auth projections (#4252) --- .../eventsourcing/handler/user_external_idps.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/auth/repository/eventsourcing/handler/user_external_idps.go b/internal/auth/repository/eventsourcing/handler/user_external_idps.go index e8304528e6..ea8dad08ea 100644 --- a/internal/auth/repository/eventsourcing/handler/user_external_idps.go +++ b/internal/auth/repository/eventsourcing/handler/user_external_idps.go @@ -109,7 +109,7 @@ func (i *ExternalIDP) processUser(event *es_models.Event) (err error) { if err != nil { 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: return i.view.DeleteExternalIDPsByUserID(event.AggregateID, event.InstanceID, event) default: @@ -125,13 +125,16 @@ func (i *ExternalIDP) processIdpConfig(event *es_models.Event) (err error) { switch eventstore.EventType(event.Type) { case instance.IDPConfigChangedEventType, org.IDPConfigChangedEventType: configView := new(iam_view_model.IDPConfigView) - config := new(query2.IDP) + var config *query2.IDP if eventstore.EventType(event.Type) == instance.IDPConfigChangedEventType { - configView.AppendEvent(iam_model.IDPProviderTypeSystem, event) + err = configView.AppendEvent(iam_model.IDPProviderTypeSystem, event) } 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 { return err } @@ -150,7 +153,6 @@ func (i *ExternalIDP) processIdpConfig(event *es_models.Event) (err error) { default: return i.view.ProcessedExternalIDPSequence(event) } - return nil } func (i *ExternalIDP) fillData(externalIDP *usr_view_model.ExternalIDPView) error {