[API] add GET /orgs endpoint (#9560)

* introduce `GET /orgs`

* add TEST

* show also other VisibleType's

* update description

* refactor a lot

* SearchUserOptions by default return only public

5 files changed, 61 insertions, 6 deletions

diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go
index e0be99872e..02068d6185 100644
--- a/routers/admin/orgs.go
+++ b/routers/admin/orgs.go
@@ -9,6 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/routers"
 )
 
@@ -25,6 +26,6 @@ func Organizations(ctx *context.Context) {
 	routers.RenderUserSearch(ctx, &models.SearchUserOptions{
 		Type:     models.UserTypeOrganization,
 		PageSize: setting.UI.Admin.OrgPagingNum,
-		Private:  true,
+		Visible:  []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate},
 	}, tplOrgs)
 }
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
index 1db4e592ff..ca2ef574f3 100644
--- a/routers/api/v1/admin/org.go
+++ b/routers/api/v1/admin/org.go
@@ -104,7 +104,7 @@ func GetAllOrgs(ctx *context.APIContext) {
 		OrderBy:  models.SearchOrderByAlphabetically,
 		Page:     ctx.QueryInt("page"),
 		PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
-		Private:  true,
+		Visible:  []api.VisibleType{api.VisibleTypePublic, api.VisibleTypeLimited, api.VisibleTypePrivate},
 	})
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "SearchOrganizations", err)
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index fd7f7c05cf..86c7450173 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -821,6 +821,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/user/orgs", reqToken(), org.ListMyOrgs)
 		m.Get("/users/:username/orgs", org.ListUserOrgs)
 		m.Post("/orgs", reqToken(), bind(api.CreateOrgOption{}), org.Create)
+		m.Get("/orgs", org.GetAll)
 		m.Group("/orgs/:orgname", func() {
 			m.Combo("").Get(org.Get).
 				Patch(reqToken(), reqOrgOwnership(), bind(api.EditOrgOption{}), org.Edit).
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 67770e70aa..4bcd60a679 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -66,6 +66,53 @@ func ListUserOrgs(ctx *context.APIContext) {
 	listUserOrgs(ctx, u, ctx.User.IsAdmin)
 }
 
+// GetAll return list of all public organizations
+func GetAll(ctx *context.APIContext) {
+	// swagger:operation Get /orgs organization orgGetAll
+	// ---
+	// summary: Get list of organizations
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: page
+	//   in: query
+	//   description: page number of results to return (1-based)
+	//   type: integer
+	// - name: limit
+	//   in: query
+	//   description: page size of results, maximum page size is 50
+	//   type: integer
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/OrganizationList"
+
+	vMode := []api.VisibleType{api.VisibleTypePublic}
+	if ctx.IsSigned {
+		vMode = append(vMode, api.VisibleTypeLimited)
+		if ctx.User.IsAdmin {
+			vMode = append(vMode, api.VisibleTypePrivate)
+		}
+	}
+
+	publicOrgs, _, err := models.SearchUsers(&models.SearchUserOptions{
+		Type:     models.UserTypeOrganization,
+		OrderBy:  models.SearchOrderByAlphabetically,
+		Page:     ctx.QueryInt("page"),
+		PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
+		Visible:  vMode,
+	})
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "SearchOrganizations", err)
+		return
+	}
+	orgs := make([]*api.Organization, len(publicOrgs))
+	for i := range publicOrgs {
+		orgs[i] = convert.ToOrganization(publicOrgs[i])
+	}
+
+	ctx.JSON(http.StatusOK, &orgs)
+}
+
 // Create api for create organization
 func Create(ctx *context.APIContext, form api.CreateOrgOption) {
 	// swagger:operation POST /orgs organization orgCreate
diff --git a/routers/home.go b/routers/home.go
index 773e0f3d6b..0f59c95705 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -15,6 +15,7 @@ import (
 	code_indexer "code.gitea.io/gitea/modules/indexer/code"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers/user"
 )
@@ -249,7 +250,7 @@ func ExploreUsers(ctx *context.Context) {
 		Type:     models.UserTypeIndividual,
 		PageSize: setting.UI.ExplorePagingNum,
 		IsActive: util.OptionalBoolTrue,
-		Private:  true,
+		Visible:  []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate},
 	}, tplExploreUsers)
 }
 
@@ -265,12 +266,17 @@ func ExploreOrganizations(ctx *context.Context) {
 		ownerID = ctx.User.ID
 	}
 
-	RenderUserSearch(ctx, &models.SearchUserOptions{
+	opts := models.SearchUserOptions{
 		Type:     models.UserTypeOrganization,
 		PageSize: setting.UI.ExplorePagingNum,
-		Private:  ctx.User != nil,
 		OwnerID:  ownerID,
-	}, tplExploreOrganizations)
+	}
+	if ctx.User != nil {
+		opts.Visible = []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}
+	} else {
+		opts.Visible = []structs.VisibleType{structs.VisibleTypePublic}
+	}
+	RenderUserSearch(ctx, &opts, tplExploreOrganizations)
 }
 
 // ExploreCode render explore code page