From 24d369a7d2cc336eb566cee560c6ba306c6ad7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 8 Dec 2022 14:42:09 +0800 Subject: [PATCH] fix(cloudid): support custom saml user name (#15512) --- pkg/cloudid/models/samluser.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cloudid/models/samluser.go b/pkg/cloudid/models/samluser.go index 63c2b66481..7606f69eaf 100644 --- a/pkg/cloudid/models/samluser.go +++ b/pkg/cloudid/models/samluser.go @@ -128,10 +128,14 @@ func (manager *SSamluserManager) ValidateCreateData(ctx context.Context, userCre return input, errors.Wrapf(err, "FetchUserById") } input.OwnerId = user.Id - input.Name = user.Name + if len(input.Name) == 0 { + input.Name = user.Name + } } else { input.OwnerId = userCred.GetUserId() - input.Name = userCred.GetUserName() + if len(input.Name) == 0 { + input.Name = userCred.GetUserName() + } } _group, err := validators.ValidateModel(userCred, CloudgroupManager, &input.CloudgroupId) if err != nil {