opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1872 from swordqiu/hotfix/qj-user-init-nil-extra

Browse Source 
fix: keystone user initialization nil pointer error
This commit is contained in:
yunion-ci-robot
2019-07-24 09:24:05 +08:00
committed by GitHub
parent 7be5360040 8cf960df7c
commit 1d323d2bbc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/users.go
+7 -4
View File
@@ -116,10 +116,13 @@ func (manager *SUserManager) InitializeData() error {
if len(name) == 0 {
name = extUser.IdpName
}
desc, _ := users[i].Extra.GetString("description")
email, _ := users[i].Extra.GetString("email")
mobile, _ := users[i].Extra.GetString("mobile")
dispName, _ := users[i].Extra.GetString("displayname")
var desc, email, mobile, dispName string
if users[i].Extra != nil {
desc, _ = users[i].Extra.GetString("description")
email, _ = users[i].Extra.GetString("email")
mobile, _ = users[i].Extra.GetString("mobile")
dispName, _ = users[i].Extra.GetString("displayname")
}
_, err = db.Update(&users[i], func() error {
users[i].Name = name
if len(email) > 0 {