feat: notification loginname (#381)

* feat: add login names to notify user

* feat: add login names to initial mail

* feat: add login names to initial mail

internal/user/model/notify_user.go

@@ -6,23 +6,25 @@ import (
 )
 
 type NotifyUser struct {
-	ID                string
-	CreationDate      time.Time
-	ChangeDate        time.Time
-	ResourceOwner     string
-	UserName          string
-	FirstName         string
-	LastName          string
-	NickName          string
-	DisplayName       string
-	PreferredLanguage string
-	Gender            Gender
-	LastEmail         string
-	VerifiedEmail     string
-	LastPhone         string
-	VerifiedPhone     string
-	PasswordSet       bool
-	Sequence          uint64
+	ID                 string
+	CreationDate       time.Time
+	ChangeDate         time.Time
+	ResourceOwner      string
+	UserName           string
+	PreferredLoginName string
+	LoginNames         []string
+	FirstName          string
+	LastName           string
+	NickName           string
+	DisplayName        string
+	PreferredLanguage  string
+	Gender             Gender
+	LastEmail          string
+	VerifiedEmail      string
+	LastPhone          string
+	VerifiedPhone      string
+	PasswordSet        bool
+	Sequence           uint64
 }
 
 type NotifyUserSearchRequest struct {
@@ -36,8 +38,9 @@ type NotifyUserSearchRequest struct {
 type NotifyUserSearchKey int32
 
 const (
-	NotifyUserSearchKeyUnspecified UserSearchKey = iota
+	NotifyUserSearchKeyUnspecified NotifyUserSearchKey = iota
 	NotifyUserSearchKeyUserID
+	NotifyUserSearchKeyResourceOwner
 )
 
 type NotifyUserSearchQuery struct {

internal/user/repository/view/model/notify_user.go

@@ -5,79 +5,108 @@ import (
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/models"
+	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
+	"github.com/lib/pq"
 	"time"
 )
 
 const (
-	NotifyUserKeyUserID = "id"
+	NotifyUserKeyUserID        = "id"
+	NotifyUserKeyResourceOwner = "id"
 )
 
 type NotifyUser struct {
-	ID                string    `json:"-" gorm:"column:id;primary_key"`
-	CreationDate      time.Time `json:"-" gorm:"column:creation_date"`
-	ChangeDate        time.Time `json:"-" gorm:"column:change_date"`
-	ResourceOwner     string    `json:"-" gorm:"column:resource_owner"`
-	UserName          string    `json:"userName" gorm:"column:user_name"`
-	FirstName         string    `json:"firstName" gorm:"column:first_name"`
-	LastName          string    `json:"lastName" gorm:"column:last_name"`
-	NickName          string    `json:"nickName" gorm:"column:nick_name"`
-	DisplayName       string    `json:"displayName" gorm:"column:display_name"`
-	PreferredLanguage string    `json:"preferredLanguage" gorm:"column:preferred_language"`
-	Gender            int32     `json:"gender" gorm:"column:gender"`
-	LastEmail         string    `json:"email" gorm:"column:last_email"`
-	VerifiedEmail     string    `json:"-" gorm:"column:verified_email"`
-	LastPhone         string    `json:"phone" gorm:"column:last_phone"`
-	VerifiedPhone     string    `json:"-" gorm:"column:verified_phone"`
-	PasswordSet       bool      `json:"-" gorm:"column:password_set"`
-	Sequence          uint64    `json:"-" gorm:"column:sequence"`
+	ID                 string         `json:"-" gorm:"column:id;primary_key"`
+	CreationDate       time.Time      `json:"-" gorm:"column:creation_date"`
+	ChangeDate         time.Time      `json:"-" gorm:"column:change_date"`
+	ResourceOwner      string         `json:"-" gorm:"column:resource_owner"`
+	UserName           string         `json:"userName" gorm:"column:user_name"`
+	LoginNames         pq.StringArray `json:"-" gorm:"column:login_names"`
+	PreferredLoginName string         `json:"-" gorm:"column:preferred_login_name"`
+	FirstName          string         `json:"firstName" gorm:"column:first_name"`
+	LastName           string         `json:"lastName" gorm:"column:last_name"`
+	NickName           string         `json:"nickName" gorm:"column:nick_name"`
+	DisplayName        string         `json:"displayName" gorm:"column:display_name"`
+	PreferredLanguage  string         `json:"preferredLanguage" gorm:"column:preferred_language"`
+	Gender             int32          `json:"gender" gorm:"column:gender"`
+	LastEmail          string         `json:"email" gorm:"column:last_email"`
+	VerifiedEmail      string         `json:"-" gorm:"column:verified_email"`
+	LastPhone          string         `json:"phone" gorm:"column:last_phone"`
+	VerifiedPhone      string         `json:"-" gorm:"column:verified_phone"`
+	PasswordSet        bool           `json:"-" gorm:"column:password_set"`
+	Sequence           uint64         `json:"-" gorm:"column:sequence"`
 }
 
 func NotifyUserFromModel(user *model.NotifyUser) *NotifyUser {
 	return &NotifyUser{
-		ID:                user.ID,
-		ChangeDate:        user.ChangeDate,
-		CreationDate:      user.CreationDate,
-		ResourceOwner:     user.ResourceOwner,
-		UserName:          user.UserName,
-		FirstName:         user.FirstName,
-		LastName:          user.LastName,
-		NickName:          user.NickName,
-		DisplayName:       user.DisplayName,
-		PreferredLanguage: user.PreferredLanguage,
-		Gender:            int32(user.Gender),
-		LastEmail:         user.LastEmail,
-		VerifiedEmail:     user.VerifiedEmail,
-		LastPhone:         user.LastPhone,
-		VerifiedPhone:     user.VerifiedPhone,
-		PasswordSet:       user.PasswordSet,
-		Sequence:          user.Sequence,
+		ID:                 user.ID,
+		ChangeDate:         user.ChangeDate,
+		CreationDate:       user.CreationDate,
+		ResourceOwner:      user.ResourceOwner,
+		UserName:           user.UserName,
+		LoginNames:         user.LoginNames,
+		PreferredLoginName: user.PreferredLoginName,
+		FirstName:          user.FirstName,
+		LastName:           user.LastName,
+		NickName:           user.NickName,
+		DisplayName:        user.DisplayName,
+		PreferredLanguage:  user.PreferredLanguage,
+		Gender:             int32(user.Gender),
+		LastEmail:          user.LastEmail,
+		VerifiedEmail:      user.VerifiedEmail,
+		LastPhone:          user.LastPhone,
+		VerifiedPhone:      user.VerifiedPhone,
+		PasswordSet:        user.PasswordSet,
+		Sequence:           user.Sequence,
 	}
 }
 
 func NotifyUserToModel(user *NotifyUser) *model.NotifyUser {
 	return &model.NotifyUser{
-		ID:                user.ID,
-		ChangeDate:        user.ChangeDate,
-		CreationDate:      user.CreationDate,
-		ResourceOwner:     user.ResourceOwner,
-		UserName:          user.UserName,
-		FirstName:         user.FirstName,
-		LastName:          user.LastName,
-		NickName:          user.NickName,
-		DisplayName:       user.DisplayName,
-		PreferredLanguage: user.PreferredLanguage,
-		Gender:            model.Gender(user.Gender),
-		LastEmail:         user.LastEmail,
-		VerifiedEmail:     user.VerifiedEmail,
-		LastPhone:         user.LastPhone,
-		VerifiedPhone:     user.VerifiedPhone,
-		PasswordSet:       user.PasswordSet,
-		Sequence:          user.Sequence,
+		ID:                 user.ID,
+		ChangeDate:         user.ChangeDate,
+		CreationDate:       user.CreationDate,
+		ResourceOwner:      user.ResourceOwner,
+		UserName:           user.UserName,
+		LoginNames:         user.LoginNames,
+		PreferredLoginName: user.PreferredLoginName,
+		FirstName:          user.FirstName,
+		LastName:           user.LastName,
+		NickName:           user.NickName,
+		DisplayName:        user.DisplayName,
+		PreferredLanguage:  user.PreferredLanguage,
+		Gender:             model.Gender(user.Gender),
+		LastEmail:          user.LastEmail,
+		VerifiedEmail:      user.VerifiedEmail,
+		LastPhone:          user.LastPhone,
+		VerifiedPhone:      user.VerifiedPhone,
+		PasswordSet:        user.PasswordSet,
+		Sequence:           user.Sequence,
 	}
 }
 
+func (u *NotifyUser) GenerateLoginName(domain string, appendDomain bool) string {
+	if !appendDomain {
+		return u.UserName
+	}
+	return u.UserName + "@" + domain
+}
+
+func (u *NotifyUser) SetLoginNames(policy *org_model.OrgIamPolicy, domains []*org_model.OrgDomain) {
+	loginNames := make([]string, 0)
+	for _, d := range domains {
+		if d.Verified {
+			loginNames = append(loginNames, u.GenerateLoginName(d.Domain, true))
+		}
+	}
+	if !policy.UserLoginMustBeDomain {
+		loginNames = append(loginNames, u.UserName)
+	}
+	u.LoginNames = loginNames
+}
+
 func (u *NotifyUser) AppendEvent(event *models.Event) (err error) {
 	u.ChangeDate = event.CreationDate
 	u.Sequence = event.Sequence

internal/user/repository/view/model/notify_user_query.go

@@ -0,0 +1,61 @@
+package model
+
+import (
+	global_model "github.com/caos/zitadel/internal/model"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/internal/view/repository"
+)
+
+type NotifyUserSearchRequest usr_model.NotifyUserSearchRequest
+type NotifyUserSearchQuery usr_model.NotifyUserSearchQuery
+type NotifyUserSearchKey usr_model.NotifyUserSearchKey
+
+func (req NotifyUserSearchRequest) GetLimit() uint64 {
+	return req.Limit
+}
+
+func (req NotifyUserSearchRequest) GetOffset() uint64 {
+	return req.Offset
+}
+
+func (req NotifyUserSearchRequest) GetSortingColumn() repository.ColumnKey {
+	if req.SortingColumn == usr_model.NotifyUserSearchKeyUnspecified {
+		return nil
+	}
+	return NotifyUserSearchKey(req.SortingColumn)
+}
+
+func (req NotifyUserSearchRequest) GetAsc() bool {
+	return req.Asc
+}
+
+func (req NotifyUserSearchRequest) GetQueries() []repository.SearchQuery {
+	result := make([]repository.SearchQuery, len(req.Queries))
+	for i, q := range req.Queries {
+		result[i] = NotifyUserSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
+	}
+	return result
+}
+
+func (req NotifyUserSearchQuery) GetKey() repository.ColumnKey {
+	return NotifyUserSearchKey(req.Key)
+}
+
+func (req NotifyUserSearchQuery) GetMethod() global_model.SearchMethod {
+	return req.Method
+}
+
+func (req NotifyUserSearchQuery) GetValue() interface{} {
+	return req.Value
+}
+
+func (key NotifyUserSearchKey) ToColumnName() string {
+	switch usr_model.NotifyUserSearchKey(key) {
+	case usr_model.NotifyUserSearchKeyUserID:
+		return NotifyUserKeyUserID
+	case usr_model.NotifyUserSearchKeyResourceOwner:
+		return NotifyUserKeyResourceOwner
+	default:
+		return ""
+	}
+}

internal/user/repository/view/notify_user.go

@@ -2,6 +2,7 @@ package view
 
 import (
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	global_model "github.com/caos/zitadel/internal/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	"github.com/caos/zitadel/internal/user/repository/view/model"
 	"github.com/caos/zitadel/internal/view/repository"
@@ -10,7 +11,7 @@ import (
 
 func NotifyUserByID(db *gorm.DB, table, userID string) (*model.NotifyUser, error) {
 	user := new(model.NotifyUser)
-	query := repository.PrepareGetByKey(table, model.UserSearchKey(usr_model.NotifyUserSearchKeyUserID), userID)
+	query := repository.PrepareGetByKey(table, model.NotifyUserSearchKey(usr_model.NotifyUserSearchKeyUserID), userID)
 	err := query(db, user)
 	if caos_errs.IsNotFound(err) {
 		return nil, caos_errs.ThrowNotFound(nil, "VIEW-Gad31", "Errors.User.NotFound")
@@ -18,6 +19,20 @@ func NotifyUserByID(db *gorm.DB, table, userID string) (*model.NotifyUser, error
 	return user, err
 }
 
+func NotifyUsersByOrgID(db *gorm.DB, table, orgID string) ([]*model.NotifyUser, error) {
+	users := make([]*model.NotifyUser, 0)
+	orgIDQuery := &usr_model.NotifyUserSearchQuery{
+		Key:    usr_model.NotifyUserSearchKeyResourceOwner,
+		Method: global_model.SearchMethodEquals,
+		Value:  orgID,
+	}
+	query := repository.PrepareSearchQuery(table, model.NotifyUserSearchRequest{
+		Queries: []*usr_model.NotifyUserSearchQuery{orgIDQuery},
+	})
+	_, err := query(db, &users)
+	return users, err
+}
+
 func PutNotifyUser(db *gorm.DB, table string, project *model.NotifyUser) error {
 	save := repository.PrepareSave(table)
 	return save(db, project)