Merge pull request #2980 from swordqiu/feature/qj-keystone-token-v3-add-user-displayname

feature: keystone v3 auth response carry user's displayname/email/mobile

pkg/apis/identity/usrext.go

@@ -25,6 +25,10 @@ type SUserExtended struct {
 	LastActiveAt     time.Time
 	DomainId         string
 
+	Displayname string
+	Email       string
+	Mobile      string
+
 	LocalId       int
 	LocalName     string
 	DomainName    string

pkg/keystone/models/users.go

@@ -236,6 +236,9 @@ func (manager *SUserManager) FetchUserExtended(userId, userName, domainId, domai
 	q := users.Query(
 		users.Field("id"),
 		users.Field("name"),
+		users.Field("displayname"),
+		users.Field("email"),
+		users.Field("mobile"),
 		users.Field("enabled"),
 		users.Field("default_project_id"),
 		users.Field("created_at"),

pkg/keystone/tokens/token.go

@@ -255,6 +255,9 @@ func (t *SAuthToken) getTokenV3(
 	token.Token.Methods = []string{t.Method}
 	token.Token.User.Id = user.Id
 	token.Token.User.Name = user.Name
+	token.Token.User.Displayname = user.Displayname
+	token.Token.User.Email = user.Email
+	token.Token.User.Mobile = user.Mobile
 	token.Token.User.Domain.Id = user.DomainId
 	token.Token.User.Domain.Name = user.DomainName
 	token.Token.Context = t.Context

pkg/mcclient/token3.go

@@ -60,6 +60,10 @@ type KeystoneUserV3 struct {
 	Name                string
 	Domain              KeystoneDomainV3
 	Password_expires_at time.Time
+
+	Displayname string
+	Email       string
+	Mobile      string
 }
 
 type KeystoneServiceCatalogV3 []KeystoneServiceV3