TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:27:42 +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

7
internal/org/model/org.go
View File

@@ -2,6 +2,7 @@ package model
import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
iam_model "github.com/zitadel/zitadel/internal/iam/model"
)
@@ -36,13 +37,13 @@ func (o *Org) GetDomain(domain *OrgDomain) (int, *OrgDomain) {
return -1, nil
}
func (o *Org) GetPrimaryDomain() *OrgDomain {
func (o *Org) GetPrimaryDomain() (string, error) {
for _, d := range o.Domains {
if d.Primary {
return d
return d.Domain, nil
}
}
return nil
return "", errors.ThrowInternalf(nil, "ORG-Dertg", "no primary domain found for org: %s (instanceID: %s)", o.AggregateID, o.InstanceID)
}
func (o *Org) AddIAMDomain(iamDomain string) {