Browse Source

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).
tags/v1.22.0-rc1
Tobias Balle-Petersen 1 month ago
parent
commit
58b204b813
No account linked to committer's email address
3 changed files with 9 additions and 0 deletions
  1. 2
    0
      modules/structs/user.go
  2. 1
    0
      services/convert/user.go
  3. 6
    0
      templates/swagger/v1_json.tmpl

+ 2
- 0
modules/structs/user.go View File

@@ -20,6 +20,8 @@ type User struct {
// the user's authentication sign-in name.
// default: empty
LoginName string `json:"login_name"`
// The ID of the user's Authentication Source
SourceID int64 `json:"source_id"`
// the user's full name
FullName string `json:"full_name"`
// swagger:strfmt email

+ 1
- 0
services/convert/user.go View File

@@ -75,6 +75,7 @@ func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *ap
if authed {
result.IsAdmin = user.IsAdmin
result.LoginName = user.LoginName
result.SourceID = user.LoginSource
result.LastLogin = user.LastLoginUnix.AsTime()
result.Language = user.Language
result.IsActive = user.IsActive

+ 6
- 0
templates/swagger/v1_json.tmpl View File

@@ -24260,6 +24260,12 @@
"type": "boolean",
"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": {
"type": "integer",
"format": "int64",

Loading…
Cancel
Save