fix: import user, hide login name suffix (#1474)

* fix: import user, and label policy command side * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz <livio.a@gmail.com> (cherry picked from commit 03ddb8fc38) * fix: label policy events * loginname placeholder * fix: tests * fix: tests * Update internal/command/iam_policy_label_model.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-11 21:37:32 +00:00 · 2021-03-25 14:41:07 +01:00
parent d7255130a4
commit 4d10f3e715
58 changed files with 1444 additions and 309 deletions
--- a/internal/domain/auth_request.go
+++ b/internal/domain/auth_request.go
@@ -1,10 +1,12 @@
 package domain

 import (
-	"github.com/caos/zitadel/internal/errors"
-	"golang.org/x/text/language"
 	"strings"
 	"time"
+
+	"golang.org/x/text/language"
+
+	"github.com/caos/zitadel/internal/errors"
 )

 type AuthRequest struct {
@@ -23,23 +25,26 @@ type AuthRequest struct {
 	MaxAuthAge    uint32
 	Request       Request

-	levelOfAssurance    LevelOfAssurance
-	UserID              string
-	LoginName           string
-	DisplayName         string
-	UserOrgID           string
-	RequestedOrgID      string
-	RequestedOrgName    string
-	SelectedIDPConfigID string
-	LinkingUsers        []*ExternalUser
-	PossibleSteps       []NextStep
-	PasswordVerified    bool
-	MFAsVerified        []MFAType
-	Audience            []string
-	AuthTime            time.Time
-	Code                string
-	LoginPolicy         *LoginPolicy
-	AllowedExternalIDPs []*IDPProvider
+	levelOfAssurance       LevelOfAssurance
+	UserID                 string
+	UserName               string
+	LoginName              string
+	DisplayName            string
+	UserOrgID              string
+	RequestedOrgID         string
+	RequestedOrgName       string
+	RequestedPrimaryDomain string
+	SelectedIDPConfigID    string
+	LinkingUsers           []*ExternalUser
+	PossibleSteps          []NextStep
+	PasswordVerified       bool
+	MFAsVerified           []MFAType
+	Audience               []string
+	AuthTime               time.Time
+	Code                   string
+	LoginPolicy            *LoginPolicy
+	AllowedExternalIDPs    []*IDPProvider
+	LabelPolicy            *LabelPolicy
 }

 type ExternalUser struct {
@@ -103,8 +108,9 @@ func (a *AuthRequest) WithCurrentInfo(info *BrowserInfo) *AuthRequest {
 	return a
 }

-func (a *AuthRequest) SetUserInfo(userID, loginName, displayName, userOrgID string) {
+func (a *AuthRequest) SetUserInfo(userID, userName, loginName, displayName, userOrgID string) {
 	a.UserID = userID
+	a.UserName = userName
 	a.LoginName = loginName
 	a.DisplayName = displayName
 	a.UserOrgID = userOrgID
--- a/internal/domain/human.go
+++ b/internal/domain/human.go
@@ -1,11 +1,11 @@
 package domain

 import (
+	"time"
+
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errors "github.com/caos/zitadel/internal/errors"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
-	"strings"
-	"time"
 )

 type Human struct {
@@ -59,9 +59,6 @@ func (u *Human) CheckOrgIAMPolicy(policy *OrgIAMPolicy) error {
 	if policy == nil {
 		return caos_errors.ThrowPreconditionFailed(nil, "DOMAIN-zSH7j", "Errors.Users.OrgIamPolicyNil")
 	}
-	if policy.UserLoginMustBeDomain && strings.Contains(u.Username, "@") {
-		return caos_errors.ThrowPreconditionFailed(nil, "DOMAIN-se4sJ", "Errors.User.EmailAsUsernameNotAllowed")
-	}
 	if !policy.UserLoginMustBeDomain && u.Profile != nil && u.Username == "" && u.Email != nil {
 		u.Username = u.EmailAddress
 	}
--- a/internal/domain/next_step.go
+++ b/internal/domain/next_step.go
@@ -42,6 +42,7 @@ func (s *SelectUserStep) Type() NextStepType {

 type UserSelection struct {
 	UserID            string
+	UserName          string
 	DisplayName       string
 	LoginName         string
 	UserSessionState  UserSessionState
--- a/internal/domain/policy_label.go
+++ b/internal/domain/policy_label.go
@@ -7,9 +7,10 @@ import (
 type LabelPolicy struct {
 	models.ObjectRoot

-	Default        bool
-	PrimaryColor   string
-	SecondaryColor string
+	Default             bool
+	PrimaryColor        string
+	SecondaryColor      string
+	HideLoginNameSuffix bool
 }

 func (p *LabelPolicy) IsValid() bool {