Move API to /orgs/:org/teams/search

Signed-off-by: David Svantesson <[email protected]>

Author: davidsvantesson

models/org_team.go

@@ -45,7 +45,7 @@ type SearchTeamOptions struct {
 	Limit       int
 }
 
-// SearchTeam search for teams
+// SearchTeam search for teams. Caller is responsible to check permissions.
 func SearchTeam(opts *SearchTeamOptions) ([]*Team, int64, error) {
 	if opts.Limit <= 0 {
 		opts.Limit = 10
@@ -68,16 +68,7 @@ func SearchTeam(opts *SearchTeamOptions) ([]*Team, int64, error) {
 		cond = cond.And(keywordCond)
 	}
 
-	if opts.OrgID > 0 {
-		cond = cond.And(builder.Eq{"org_id": opts.OrgID})
-	} else if !opts.UserIsAdmin {
-		// Limit search to organizations where user is member
-		cond = cond.And(
-			builder.In("org_id", builder.Select("`org_user`.org_id").
-				From("org_user").
-				Where(builder.Eq{"`org_user`.uid": opts.UserID}).
-				Join("INNER", "org_user", "`org_user`.org_id = `team`.org_id")))
-	}
+	cond = cond.And(builder.Eq{"org_id": opts.OrgID})
 
 	sess := x.NewSession()
 	defer sess.Close()

routers/api/v1/api.go

@@ -802,8 +802,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 					Put(reqToken(), reqOrgMembership(), org.PublicizeMember).
 					Delete(reqToken(), reqOrgMembership(), org.ConcealMember)
 			})
-			m.Combo("/teams", reqToken(), reqOrgMembership()).Get(org.ListTeams).
-				Post(reqOrgOwnership(), bind(api.CreateTeamOption{}), org.CreateTeam)
+			m.Group("/teams", func() {
+				m.Combo("", reqToken()).Get(org.ListTeams).
+					Post(reqOrgOwnership(), bind(api.CreateTeamOption{}), org.CreateTeam)
+				m.Post("/search", org.SearchTeam)
+			}, reqOrgMembership())
 			m.Group("/hooks", func() {
 				m.Combo("").Get(org.ListHooks).
 					Post(bind(api.CreateHookOption{}), org.CreateHook)
@@ -831,10 +834,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 		}, orgAssignment(false, true), reqToken(), reqTeamMembership())
 
-		m.Group("/teams", func() {
-			m.Get("/search", org.SearchTeam)
-		})
-
 		m.Any("/*", func(ctx *context.APIContext) {
 			ctx.NotFound()
 		})

routers/api/v1/org/team.go

@@ -500,23 +500,22 @@ func RemoveTeamRepository(ctx *context.APIContext) {
 
 // SearchTeam api for searching teams
 func SearchTeam(ctx *context.APIContext) {
-	// swagger:operation GET /teams/search organization teamSearch
+	// swagger:operation GET /orgs/{org}/teams/search organization teamSearch
 	// ---
-	// summary: Search for teams
+	// summary: Search for teams within organization
 	// produces:
 	// - application/json
 	// parameters:
+	// - name: org
+	//   in: path
+	//   description: name of the organization
+	//   type: string
+	//   required: true
 	// - name: q
 	//   in: query
 	//   description: keywords to search
 	//   required: true
 	//   type: string
-	// - name: org_id
-	//   in: query
-	//   description: search only teams within organization
-	//   type: integer
-	//   format: int64
-	//   required: false
 	// - name: inclDesc
 	//   in: query
 	//   description: include search within team description (defaults to true)
@@ -541,22 +540,11 @@ func SearchTeam(ctx *context.APIContext) {
 		UserID:      ctx.Data["SignedUserID"].(int64),
 		UserIsAdmin: ctx.IsUserSiteAdmin(),
 		Keyword:     strings.Trim(ctx.Query("q"), " "),
-		OrgID:       ctx.QueryInt64("org_id"),
+		OrgID:       ctx.Org.Organization.ID,
 		IncludeDesc: (ctx.Query("inclDesc") == "" || ctx.QueryBool("inclDesc")),
 		Limit:       ctx.QueryInt("limit"),
 	}
 
-	// If searching in a specific organization, require organization membership
-	if opts.OrgID > 0 {
-		if isMember, err := models.IsOrganizationMember(opts.OrgID, opts.UserID); err != nil {
-			ctx.Error(500, "IsOrganizationMember", err)
-			return
-		} else if !isMember && !ctx.IsUserSiteAdmin() {
-			ctx.Error(403, "", "Must be an organization member")
-			return
-		}
-	}
-
 	teams, _, err := models.SearchTeam(opts)
 	if err != nil {
 		ctx.JSON(500, map[string]interface{}{
@@ -567,28 +555,12 @@ func SearchTeam(ctx *context.APIContext) {
 	}
 
 	apiTeams := make([]*api.Team, len(teams))
-	cache := make(map[int64]*api.Organization)
 	for i := range teams {
 		if err := teams[i].GetUnits(); err != nil {
 			ctx.Error(500, "GetUnits", err)
 			return
 		}
 		apiTeams[i] = convert.ToTeam(teams[i])
-
-		if opts.OrgID <= 0 {
-			apiOrg, ok := cache[teams[i].OrgID]
-			if !ok {
-				org, err := models.GetUserByID(teams[i].OrgID)
-				if err != nil {
-					ctx.Error(500, "GetUserByID", err)
-					return
-				}
-				apiOrg = convert.ToOrganization(org)
-				cache[teams[i].OrgID] = apiOrg
-			}
-			apiTeams[i] = convert.ToTeam(teams[i])
-			apiTeams[i].Organization = apiOrg
-		}
 	}
 
 	ctx.JSON(200, map[string]interface{}{