THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Fix team user api (#8172)

* fix team user api

* fix tests

* fix api

* fix team user api

* change user convert

* fix tests

* fix tests
tags/v1.10.0-rc1
Lunny Xiao GitHub 1 month ago
parent
commit
be0f7ff9bf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 0 deletions
  1. +36
    -0
      integrations/api_team_user_test.go
  2. +9
    -0
      routers/api/v1/org/team.go

+ 36
- 0
integrations/api_team_user_test.go View File

@@ -0,0 +1,36 @@
// Copyright 2019 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package integrations

import (
"net/http"
"testing"
"time"

"code.gitea.io/gitea/models"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/convert"
"github.com/stretchr/testify/assert"
)

func TestAPITeamUser(t *testing.T) {
prepareTestEnv(t)

normalUsername := "user2"
session := loginUser(t, normalUsername)
token := getTokenForLoggedInUser(t, session)
req := NewRequest(t, "GET", "/api/v1/teams/1/members/user1?token="+token)
session.MakeRequest(t, req, http.StatusNotFound)

req = NewRequest(t, "GET", "/api/v1/teams/1/members/user2?token="+token)
resp := session.MakeRequest(t, req, http.StatusOK)
var user2 *api.User
DecodeJSON(t, resp, &user2)
user2.Created = user2.Created.In(time.Local)
user2.LastLogin = user2.LastLogin.In(time.Local)
user := models.AssertExistsAndLoadBean(t, &models.User{Name: "user2"}).(*models.User)

assert.Equal(t, convert.ToUser(user, true, false), user2)
}

+ 9
- 0
routers/api/v1/org/team.go View File

@@ -287,6 +287,15 @@ func GetTeamMember(ctx *context.APIContext) {
if ctx.Written() {
return
}
teamID := ctx.ParamsInt64("teamid")
isTeamMember, err := models.IsUserInTeams(u.ID, []int64{teamID})
if err != nil {
ctx.Error(500, "IsUserInTeams", err)
return
} else if !isTeamMember {
ctx.NotFound()
return
}
ctx.JSON(200, convert.ToUser(u, ctx.IsSigned, ctx.User.IsAdmin))
}


Loading…
Cancel
Save