mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-01 13:44:06 +01:00
Update API to return 'source_id' for users (#29718)
Using the API, a user's _source_id_ can be set in the _CreateUserOption_ model, but the field is not returned in the _User_ model. This PR updates the _User_ model to include the field _source_id_ (The ID of the Authentication Source). (cherry picked from commit 58b204b813cd3a97db904d889d552e64a7e398ff)
This commit is contained in:
parent
3662829cc9
commit
23f032eaa5
3 changed files with 9 additions and 0 deletions
|
@ -19,6 +19,8 @@ type User struct {
|
||||||
// the user's authentication sign-in name.
|
// the user's authentication sign-in name.
|
||||||
// default: empty
|
// default: empty
|
||||||
LoginName string `json:"login_name"`
|
LoginName string `json:"login_name"`
|
||||||
|
// The ID of the user's Authentication Source
|
||||||
|
SourceID int64 `json:"source_id"`
|
||||||
// the user's full name
|
// the user's full name
|
||||||
FullName string `json:"full_name"`
|
FullName string `json:"full_name"`
|
||||||
// swagger:strfmt email
|
// swagger:strfmt email
|
||||||
|
|
|
@ -76,6 +76,7 @@ func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *ap
|
||||||
if authed {
|
if authed {
|
||||||
result.IsAdmin = user.IsAdmin
|
result.IsAdmin = user.IsAdmin
|
||||||
result.LoginName = user.LoginName
|
result.LoginName = user.LoginName
|
||||||
|
result.SourceID = user.LoginSource
|
||||||
result.LastLogin = user.LastLoginUnix.AsTime()
|
result.LastLogin = user.LastLoginUnix.AsTime()
|
||||||
result.Language = user.Language
|
result.Language = user.Language
|
||||||
result.IsActive = user.IsActive
|
result.IsActive = user.IsActive
|
||||||
|
|
6
templates/swagger/v1_json.tmpl
generated
6
templates/swagger/v1_json.tmpl
generated
|
@ -24672,6 +24672,12 @@
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"x-go-name": "Restricted"
|
"x-go-name": "Restricted"
|
||||||
},
|
},
|
||||||
|
"source_id": {
|
||||||
|
"description": "The ID of the user's Authentication Source",
|
||||||
|
"type": "integer",
|
||||||
|
"format": "int64",
|
||||||
|
"x-go-name": "SourceID"
|
||||||
|
},
|
||||||
"starred_repos_count": {
|
"starred_repos_count": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"format": "int64",
|
"format": "int64",
|
||||||
|
|
Loading…
Reference in a new issue