opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): SSO created user name may be duplicated

Browse Source
This commit is contained in:
Qiu Jian
2021-01-28 23:34:52 +08:00
parent b8b4c16c87
commit 209ba5d549
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/identity_provider.go
+12 -3
View File
@@ -1071,11 +1071,15 @@ func (self *SIdentityProvider) SyncOrCreateUser(ctx context.Context, extId strin
if err == nil {
// update
log.Debugf("find user %s", extName)
_, err := db.Update(user, func() error {
newName, err := db.GenerateAlterName(user, extName)
if err != nil {
return nil, errors.Wrapf(err, "db.GenerateAlterName %s", extName)
}
_, err = db.Update(user, func() error {
if syncUserInfo != nil {
syncUserInfo(user)
}
user.Name = extName
user.Name = newName
user.DomainId = domainId
if user.Deleted {
user.MarkUnDelete()
@@ -1099,8 +1103,13 @@ func (self *SIdentityProvider) SyncOrCreateUser(ctx context.Context, extId strin
} else {
user.Enabled = tristate.False
}
domainOwnerId := &db.SOwnerId{DomainId: domainId}
newName, err := db.GenerateName(UserManager, domainOwnerId, extName)
if err != nil {
return nil, errors.Wrapf(err, "db.GenerateName %s", extName)
}
user.Id = userId
user.Name = extName
user.Name = newName
user.DomainId = domainId
err = UserManager.TableSpec().Insert(ctx, user)
if err != nil {