add isAdmin to user model

update vendor and add tests fix swagger
go-gitea · Mar 3, 2019 · a0e94b7 · a0e94b7
1 parent 8e202e2
commit a0e94b7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/models/user.go b/models/user.go
@@ -211,6 +211,7 @@ func (u *User) APIFormat() *api.User {
  Email: u.getEmail(),
  AvatarURL: u.AvatarLink(),
  Language: u.Language,
+ IsAdmin: u.IsAdmin,
  }
 }
 

diff --git a/models/user_test.go b/models/user_test.go
@@ -23,6 +23,23 @@ func TestGetUserEmailsByNames(t *testing.T) {
  assert.Equal(t, []string{"user8@example.com", "user5@example.com"}, GetUserEmailsByNames([]string{"user8", "user5"}))
 }
 
+func TestUser_APIFormat(t *testing.T) {
+
+ user, err := GetUserByID(1)
+ assert.NoError(t, err)
+ assert.True(t, user.IsAdmin)
+
+ apiUser := user.APIFormat()
+ assert.True(t, apiUser.IsAdmin)
+
+ user, err = GetUserByID(2)
+ assert.NoError(t, err)
+ assert.False(t, user.IsAdmin)
+
+ apiUser = user.APIFormat()
+ assert.False(t, apiUser.IsAdmin)
+}
+
 func TestCanCreateOrganization(t *testing.T) {
  assert.NoError(t, PrepareTestDatabase())
 

diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
@@ -75,6 +75,7 @@ func Search(ctx *context.APIContext) {
  UserName: users[i].Name,
  AvatarURL: users[i].AvatarLink(),
  FullName: markup.Sanitize(users[i].FullName),
+ IsAdmin: users[i].IsAdmin,
  }
  if ctx.IsSigned && (!users[i].KeepEmailPrivate || ctx.User.IsAdmin) {
  results[i].Email = users[i].Email

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
@@ -8640,6 +8640,11 @@
  "format": "int64",
  "x-go-name": "ID"
  },
+ "is_admin": {
+ "description": "Is the user an administrator",
+ "type": "boolean",
+ "x-go-name": "IsAdmin"
+ },
  "language": {
  "description": "User locale",
  "type": "string",

diff --git a/vendor/code.gitea.io/sdk/gitea/user.go b/vendor/code.gitea.io/sdk/gitea/user.go