coder
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 28 additions & 2 deletions b/‎coderd/apidoc/docs.go
Lines changed: 28 additions & 2 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 24 additions & 2 deletions b/‎coderd/apidoc/swagger.json
Lines changed: 24 additions & 2 deletions
diff --git a/‎coderd/coderd.go
Lines changed: 1 addition & 0 deletions b/‎coderd/coderd.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎coderd/organizations.go
Lines changed: 27 additions & 1 deletion b/‎coderd/organizations.go
Lines changed: 27 additions & 1 deletion
diff --git a/‎coderd/organizations_test.go
Lines changed: 7 additions & 2 deletions b/‎coderd/organizations_test.go
Lines changed: 7 additions & 2 deletions
diff --git a/‎codersdk/organizations.go
Lines changed: 15 additions & 0 deletions b/‎codersdk/organizations.go
Lines changed: 15 additions & 0 deletions
diff --git a/‎docs/api/organizations.md
Lines changed: 57 additions & 1 deletion b/‎docs/api/organizations.md
Lines changed: 57 additions & 1 deletion
@@ -865,6 +865,7 @@ func New(options *Options) *API {
 				apiKeyMiddleware,
 			)
 			r.Post("/", api.postOrganizations)
+			r.Get("/", api.getOrganizations)
 			r.Route("/{organization}", func(r chi.Router) {
 				r.Use(
 					httpmw.ExtractOrganizationParam(options.Database),
 
@@ -11,14 +11,40 @@ import (
 
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/codersdk"
 )
 
 // @Summary Get organization by ID
-// @ID get-organization-by-id
+// @ID get-organizations
+// @Security CoderSessionToken
+// @Produce json
+// @Tags Organizations
+// @Success 200 {object} []codersdk.Organization
+// @Router /organizations [get]
+func (api *API) getOrganizations(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	organizations, err := api.Database.GetOrganizations(ctx)
+	if httpapi.Is404Error(err) {
+		httpapi.ResourceNotFound(rw)
+		return
+	}
+	if err != nil {
+		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
+			Message: "Internal error fetching organizations.",
+			Detail:  err.Error(),
+		})
+		return
+	}
+
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(organizations, convertOrganization))
+}
+
+// @Summary Get organizations
+// @ID get-organizations
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Organizations
 
@@ -27,10 +27,15 @@ func TestMultiOrgFetch(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	orgs, err := client.OrganizationsByUser(ctx, codersdk.Me)
+	myOrgs, err := client.OrganizationsByUser(ctx, codersdk.Me)
+	require.NoError(t, err)
+	require.NotNil(t, myOrgs)
+	require.Len(t, myOrgs, len(makeOrgs)+1)
+
+	orgs, err := client.Organizations(ctx)
 	require.NoError(t, err)
 	require.NotNil(t, orgs)
-	require.Len(t, orgs, len(makeOrgs)+1)
+	require.ElementsMatch(t, myOrgs, orgs)
 }
 
 func TestOrganizationsByUser(t *testing.T) {
 
@@ -215,6 +215,21 @@ func (c *Client) OrganizationByName(ctx context.Context, name string) (Organizat
 	return organization, json.NewDecoder(res.Body).Decode(&organization)
 }
 
+func (c *Client) Organizations(ctx context.Context) ([]Organization, error) {
+	res, err := c.Request(ctx, http.MethodGet, "/api/v2/organizations", nil)
+	if err != nil {
+		return []Organization{}, xerrors.Errorf("execute request: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return []Organization{}, ReadBodyAsError(res)
+	}
+
+	var organizations []Organization
+	return organizations, json.NewDecoder(res.Body).Decode(&organizations)
+}
+
 func (c *Client) Organization(ctx context.Context, id uuid.UUID) (Organization, error) {
 	// OrganizationByName uses the exact same endpoint. It accepts a name or uuid.
 	// We just provide this function for type safety.
Original file line number	Diff line number	Diff line change
`@@ -865,6 +865,7 @@ func New(options Options) API {`
`865`	`865`	`apiKeyMiddleware,`
`866`	`866`	`)`
`867`	`867`	`r.Post("/", api.postOrganizations)`
	`868`	`+ r.Get("/", api.getOrganizations)`
`868`	`869`	`r.Route("/{organization}", func(r chi.Router) {`
`869`	`870`	`r.Use(`
`870`	`871`	`httpmw.ExtractOrganizationParam(options.Database),`