Add Active and ProhibitLogin to API (#15689)

* Added active and prohibit_login.

* Do not omit fields for normal users.
release/v1.15
KN4CK3R 2021-05-11 02:22:29 +02:00 committed by GitHub
parent d86d123322
commit f8335444de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 0 deletions

View File

@ -58,6 +58,8 @@ func toUser(user *models.User, signed, authed bool) *api.User {
result.IsAdmin = user.IsAdmin result.IsAdmin = user.IsAdmin
result.LastLogin = user.LastLoginUnix.AsTime() result.LastLogin = user.LastLoginUnix.AsTime()
result.Language = user.Language result.Language = user.Language
result.IsActive = user.IsActive
result.ProhibitLogin = user.ProhibitLogin
} }
return result return result
} }

View File

@ -33,6 +33,10 @@ type User struct {
Created time.Time `json:"created,omitempty"` Created time.Time `json:"created,omitempty"`
// Is user restricted // Is user restricted
Restricted bool `json:"restricted"` Restricted bool `json:"restricted"`
// Is user active
IsActive bool `json:"active"`
// Is user login prohibited
ProhibitLogin bool `json:"prohibit_login"`
// the user's location // the user's location
Location string `json:"location"` Location string `json:"location"`
// the user's website // the user's website

View File

@ -16250,6 +16250,11 @@
"description": "User represents a user", "description": "User represents a user",
"type": "object", "type": "object",
"properties": { "properties": {
"active": {
"description": "Is user active",
"type": "boolean",
"x-go-name": "IsActive"
},
"avatar_url": { "avatar_url": {
"description": "URL to the user's avatar", "description": "URL to the user's avatar",
"type": "string", "type": "string",
@ -16306,6 +16311,11 @@
"type": "string", "type": "string",
"x-go-name": "UserName" "x-go-name": "UserName"
}, },
"prohibit_login": {
"description": "Is user login prohibited",
"type": "boolean",
"x-go-name": "ProhibitLogin"
},
"restricted": { "restricted": {
"description": "Is user restricted", "description": "Is user restricted",
"type": "boolean", "type": "boolean",