TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: send preferred login name on init user mail (#3105)

Browse Source 
* fix: send preferred login name on init user

* trigger gh actions

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi 2022-01-24 15:22:27 +01:00 committed by GitHub
parent a824312be3
commit b64b5d89ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/notification/repository/eventsourcing/handler/handler.go
View File

@ -61,7 +61,7 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es
func (configs Configs) cycleDuration(viewModel string) time.Duration { func (configs Configs) cycleDuration(viewModel string) time.Duration {
c, ok := configs[viewModel] c, ok := configs[viewModel]
if !ok { if !ok {
return 3 * time.Minute return 1 * time.Minute
} }
return c.MinimumCycleDuration.Duration return c.MinimumCycleDuration.Duration
} }

22
internal/notification/repository/eventsourcing/handler/notification.go
View File

@ -436,25 +436,5 @@ func (n *Notification) getTranslatorWithOrgTexts(orgID, textType string) (*i18n.
} }
func (n *Notification) getUserByID(userID string) (*model.NotifyUser, error) { func (n *Notification) getUserByID(userID string) (*model.NotifyUser, error) {
user, usrErr := n.view.NotifyUserByID(userID) return n.view.NotifyUserByID(userID)
if usrErr != nil && !errors.IsNotFound(usrErr) {
return nil, usrErr
}
if user == nil {
user = &model.NotifyUser{}
}
events, err := n.getUserEvents(userID, user.Sequence)
if err != nil {
return user, usrErr
}
userCopy := *user
for _, event := range events {
if err := userCopy.AppendEvent(event); err != nil {
return user, nil
}
}
if userCopy.State == int32(model.UserStateDeleted) {
return nil, errors.ThrowNotFound(nil, "HANDLER-3n8fs", "Errors.User.NotFound")
}
return &userCopy, nil
} }

12
internal/notification/repository/eventsourcing/handler/notify_user.go
View File

@ -196,13 +196,11 @@ func (u *NotifyUser) fillPreferredLoginNamesOnOrgUsers(event *es_models.Event) e
if err != nil { if err != nil {
return err return err
} }
policy := new(query2.OrgIAMPolicy)
if policy == nil { policy, err := u.getDefaultOrgIAMPolicy(context.Background())
policy, err = u.getDefaultOrgIAMPolicy(context.Background())
if err != nil { if err != nil {
return err return err
} }
}
if !policy.UserLoginMustBeDomain { if !policy.UserLoginMustBeDomain {
return nil return nil
} }
@ -225,13 +223,11 @@ func (u *NotifyUser) fillLoginNames(user *view_model.NotifyUser) (err error) {
if err != nil { if err != nil {
return err return err
} }
policy := new(query2.OrgIAMPolicy)
if policy == nil { policy, err := u.getDefaultOrgIAMPolicy(context.Background())
policy, err = u.getDefaultOrgIAMPolicy(context.Background())
if err != nil { if err != nil {
return err return err
} }
}
user.SetLoginNames(policy, org.Domains) user.SetLoginNames(policy, org.Domains)
user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain, policy.UserLoginMustBeDomain) user.PreferredLoginName = user.GenerateLoginName(org.GetPrimaryDomain().Domain, policy.UserLoginMustBeDomain)
return nil return nil