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

fix: loginnames in login and mails (eventstore v1 queries) (#3636)

Browse Source 
* fix: loginnames in login and mails (eventstore v1 queries)

* fix: loginnames in login and mails (eventstore v1 queries)
This commit is contained in:
Livio Amstutz
2022-05-16 15:10:10 +02:00
committed by GitHub
parent 8bcea0ef1a
commit f1fa74a2c0
6 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/authz/repository/eventsourcing/handler/user_membership.go
View File

@@ -178,7 +178,7 @@ func (m *UserMembership) processOrg(event *es_models.Event) (err error) {
}
func (m *UserMembership) fillOrgName(member *usr_es_model.UserMembershipView) (err error) {
org, err := m.getOrgByID(context.Background(), member.ResourceOwner)
org, err := m.getOrgByID(context.Background(), member.ResourceOwner, member.InstanceID)
if err != nil {
return err
}
@@ -190,7 +190,7 @@ func (m *UserMembership) fillOrgName(member *usr_es_model.UserMembershipView) (e
}
func (m *UserMembership) updateOrgName(event *es_models.Event) error {
org, err := m.getOrgByID(context.Background(), event.AggregateID)
org, err := m.getOrgByID(context.Background(), event.AggregateID, event.InstanceID)
if err != nil {
return err
}
@@ -300,8 +300,8 @@ func (m *UserMembership) OnSuccess() error {
return spooler.HandleSuccess(m.view.UpdateUserMembershipSpoolerRunTimestamp)
}
func (u *UserMembership) getOrgByID(ctx context.Context, orgID string) (*org_model.Org, error) {
query, err := org_view.OrgByIDQuery(orgID, 0)
func (u *UserMembership) getOrgByID(ctx context.Context, orgID, instanceID string) (*org_model.Org, error) {
query, err := org_view.OrgByIDQuery(orgID, instanceID, 0)
if err != nil {
return nil, err
}