chore: move multi-org endpoints into enterprise directory

Emyrk · Emyrk · commit 3fe0fc226c33 · 2024-07-25T15:32:37.000-05:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -864,15 +864,14 @@ func New(options *Options) *API {
 			r.Use(
 				apiKeyMiddleware,
 			)
-			r.Post("/", api.postOrganizations)
+			api.APISubRoutes.Organizations = r
 			r.Get("/", api.organizations)
 			r.Route("/{organization}", func(r chi.Router) {
 				r.Use(
 					httpmw.ExtractOrganizationParam(options.Database),
 				)
+				api.APISubRoutes.SingleOrganization = r
 				r.Get("/", api.organization)
-				r.Patch("/", api.patchOrganization)
-				r.Delete("/", api.deleteOrganization)
 				r.Post("/templateversions", api.postTemplateVersionsByOrganization)
 				r.Route("/templates", func(r chi.Router) {
 					r.Post("/", api.postTemplateByOrganization)
@@ -1336,6 +1335,13 @@ type API struct {
 
 	// APIHandler serves "/api/v2"
 	APIHandler chi.Router
+	// APISubRoutes are AGPL sub routers that are saved for enterprise
+	// to add endpoints to. Chi does not allow conflicting routers to
+	// exist, so this is the easier way to "merge" routers.
+	APISubRoutes struct {
+		Organizations      chi.Router
+		SingleOrganization chi.Router
+	}
 	// RootHandler serves "/"
 	RootHandler chi.Router
 
diff --git a/coderd/users.go b/coderd/users.go
@@ -1167,12 +1167,7 @@ func (api *API) organizationsByUser(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	publicOrganizations := make([]codersdk.Organization, 0, len(organizations))
-	for _, organization := range organizations {
-		publicOrganizations = append(publicOrganizations, convertOrganization(organization))
-	}
-
-	httpapi.Write(ctx, rw, http.StatusOK, publicOrganizations)
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(organizations, db2sdk.Organization))
 }
 
 // @Summary Get organization by user and organization name
@@ -1200,7 +1195,7 @@ func (api *API) organizationByUserAndName(rw http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusOK, convertOrganization(organization))
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.Organization(organization))
 }
 
 type CreateUserRequest struct {
diff --git a/enterprise/coderd/organizations.go b/enterprise/coderd/organizations.go
@@ -0,0 +1 @@
+package coderd
diff --git a/enterprise/coderd/organizations_test.go b/enterprise/coderd/organizations_test.go

Original file line number	Diff line number	Diff line change
`@@ -1167,12 +1167,7 @@ func (api API) organizationsByUser(rw http.ResponseWriter, r http.Request) {`
`1167`	`1167`	`return`
`1168`	`1168`	`}`
`1169`	`1169`
`1170`		`- publicOrganizations := make([]codersdk.Organization, 0, len(organizations))`
`1171`		`- for _, organization := range organizations {`
`1172`		`- publicOrganizations = append(publicOrganizations, convertOrganization(organization))`
`1173`		`- }`
`1174`		`-`
`1175`		`- httpapi.Write(ctx, rw, http.StatusOK, publicOrganizations)`
	`1170`	`+ httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(organizations, db2sdk.Organization))`
`1176`	`1171`	`}`
`1177`	`1172`
`1178`	`1173`	`// @Summary Get organization by user and organization name`
`@@ -1200,7 +1195,7 @@ func (api API) organizationByUserAndName(rw http.ResponseWriter, r http.Reques`
`1200`	`1195`	`return`
`1201`	`1196`	`}`
`1202`	`1197`
`1203`		`- httpapi.Write(ctx, rw, http.StatusOK, convertOrganization(organization))`
	`1198`	`+ httpapi.Write(ctx, rw, http.StatusOK, db2sdk.Organization(organization))`
`1204`	`1199`	`}`
`1205`	`1200`
`1206`	`1201`	`type CreateUserRequest struct {`