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: login names (and query) (#253)

Browse Source
This commit is contained in:
Livio Amstutz
2020-06-22 10:38:29 +02:00
committed by GitHub
parent d89087cbe0
commit 66cca48b62
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ func (u *User) fillLoginNames(user *view_model.UserView) (err error) {
return err
}
user.SetLoginNames(policy, org.Domains)
user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain)
user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain, policy.UserLoginMustBeDomain)
return nil
}
@@ -165,7 +165,7 @@ func (u *User) fillPreferredLoginNamesOnOrgUsers(event *models.Event) error {
return err
}
for _, user := range users {
user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain)
user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain, policy.UserLoginMustBeDomain)
err := u.view.PutUser(user, 0)
if err != nil {
return err