Add labels property to default-client response and auth.user
This commit is contained in:
parent
f27ce16ff9
commit
99a4007c54
@ -370,15 +370,12 @@ export class Auth {
|
||||
|
||||
const authUser = new system.User({
|
||||
userID: data.sub,
|
||||
name: data.name,
|
||||
email: data.email,
|
||||
handle: data.username,
|
||||
roles: data.roles || [],
|
||||
meta: {
|
||||
preferredLanguage: data.preferred_language || 'en',
|
||||
avatarID: data.avatarID,
|
||||
theme: data.theme,
|
||||
},
|
||||
...data,
|
||||
})
|
||||
|
||||
this[user] = authUser
|
||||
@ -570,15 +567,12 @@ export class Auth {
|
||||
|
||||
const u = new system.User({
|
||||
userID: oa2tkn.sub,
|
||||
name: oa2tkn.name,
|
||||
handle: oa2tkn.handle,
|
||||
email: oa2tkn.email,
|
||||
roles: oa2tkn.roles || [],
|
||||
meta: {
|
||||
preferredLanguage: oa2tkn.preferred_language || 'en',
|
||||
avatarID: oa2tkn.avatarID,
|
||||
theme: oa2tkn.theme,
|
||||
},
|
||||
...oa2tkn,
|
||||
})
|
||||
|
||||
this[accessToken] = oa2tkn.access_token
|
||||
|
||||
@ -457,6 +457,12 @@ func (h AuthHandlers) handleTokenRequest(req *request.AuthReq, client *types.Aut
|
||||
response["avatarID"] = strconv.FormatUint(user.Meta.AvatarID, 10)
|
||||
}
|
||||
|
||||
if user.Labels != nil {
|
||||
response["labels"] = user.Labels
|
||||
} else {
|
||||
response["labels"] = make(map[string]interface{})
|
||||
}
|
||||
|
||||
//include user's theme
|
||||
response["theme"] = user.Meta.Theme
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user