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

fix: prevent panic in loginNameInformation (#6876)

Browse Source
This commit is contained in:
Livio Spring
2023-11-07 12:16:49 +02:00
committed by GitHub
parent a50d1408be
commit e342e3d99b
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/auth/repository/eventsourcing/handler/user.go
View File

@@ -531,14 +531,18 @@ func (u *User) loginNameInformation(ctx context.Context, orgID string, instanceI
if err != nil {
return false, "", nil, err
}
primaryDomain, err = org.GetPrimaryDomain()
if err != nil {
return false, "", nil, err
}
if org.DomainPolicy != nil {
return org.DomainPolicy.UserLoginMustBeDomain, org.GetPrimaryDomain().Domain, org.Domains, nil
return org.DomainPolicy.UserLoginMustBeDomain, primaryDomain, org.Domains, nil
}
policy, err := u.queries.DefaultDomainPolicy(authz.WithInstanceID(ctx, org.InstanceID))
if err != nil {
return false, "", nil, err
}
return policy.UserLoginMustBeDomain, org.GetPrimaryDomain().Domain, org.Domains, nil
return policy.UserLoginMustBeDomain, primaryDomain, org.Domains, nil
}
func (u *User) userFromEventstore(agg *eventstore.Aggregate, eventTypes []eventstore.EventType) (*view_model.UserView, error) {

8
internal/auth/repository/eventsourcing/handler/user_session.go
View File

@@ -358,14 +358,18 @@ func (u *UserSession) loginNameInformation(ctx context.Context, orgID string, in
if err != nil {
return false, "", err
}
primaryDomain, err = org.GetPrimaryDomain()
if err != nil {
return false, "", err
}
if org.DomainPolicy != nil {
return org.DomainPolicy.UserLoginMustBeDomain, org.GetPrimaryDomain().Domain, nil
return org.DomainPolicy.UserLoginMustBeDomain, primaryDomain, nil
}
policy, err := u.queries.DefaultDomainPolicy(authz.WithInstanceID(ctx, org.InstanceID))
if err != nil {
return false, "", err
}
return policy.UserLoginMustBeDomain, org.GetPrimaryDomain().Domain, nil
return policy.UserLoginMustBeDomain, primaryDomain, nil
}
func (u *UserSession) getOrgByID(ctx context.Context, orgID, instanceID string) (*org_model.Org, error) {