chore: add organization member api + cli

Emyrk · Emyrk · commit 68a5b2be1ccb · 2024-06-14T12:01:04.000-05:00
diff --git a/cli/organization.go b/cli/organization.go
@@ -29,8 +29,8 @@ func (r *RootCmd) organizations() *serpent.Command {
 			r.currentOrganization(),
 			r.switchOrganization(),
 			r.createOrganization(),
-			r.organizationRoles(),
 			r.organizationMembers(),
+			r.organizationRoles(),
 		},
 	}
 
diff --git a/cli/organizationmembers.go b/cli/organizationmembers.go
@@ -19,6 +19,7 @@ func (r *RootCmd) organizationMembers() *serpent.Command {
 		Children: []*serpent.Command{
 			r.listOrganizationMembers(),
 			r.assignOrganizationRoles(),
+			r.addOrganizationMember(),
 		},
 		Handler: func(inv *serpent.Invocation) error {
 			return inv.Command.HelpHandler(inv)
@@ -28,6 +29,36 @@ func (r *RootCmd) organizationMembers() *serpent.Command {
 	return cmd
 }
 
+func (r *RootCmd) addOrganizationMember() *serpent.Command {
+	client := new(codersdk.Client)
+
+	cmd := &serpent.Command{
+		Use:   "add <username | user_id>",
+		Short: "Add a new member to the current organization",
+		Middleware: serpent.Chain(
+			r.InitClient(client),
+			serpent.RequireNArgs(1),
+		),
+		Handler: func(inv *serpent.Invocation) error {
+			ctx := inv.Context()
+			organization, err := CurrentOrganization(r, inv, client)
+			if err != nil {
+				return err
+			}
+			user := inv.Args[0]
+			_, err = client.PostOrganizationMember(ctx, organization.ID, user)
+			if err != nil {
+				return xerrors.Errorf("could not add member to organization: %w", err)
+			}
+
+			_, _ = fmt.Fprintln(inv.Stdout, "Organization member added")
+			return nil
+		},
+	}
+
+	return cmd
+}
+
 func (r *RootCmd) assignOrganizationRoles() *serpent.Command {
 	client := new(codersdk.Client)
 
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -845,11 +845,20 @@ func New(options *Options) *API {
 					})
 
 					r.Route("/{user}", func(r chi.Router) {
-						r.Use(
-							httpmw.ExtractOrganizationMemberParam(options.Database),
-						)
-						r.Put("/roles", api.putMemberRoles)
-						r.Post("/workspaces", api.postWorkspacesByOrganization)
+						r.Group(func(r chi.Router) {
+							r.Use(
+								httpmw.ExtractUserParam(options.Database),
+							)
+							r.Post("/", api.postOrganizationMember)
+						})
+
+						r.Group(func(r chi.Router) {
+							r.Use(
+								httpmw.ExtractOrganizationMemberParam(options.Database),
+							)
+							r.Put("/roles", api.putMemberRoles)
+							r.Post("/workspaces", api.postWorkspacesByOrganization)
+						})
 					})
 				})
 			})
diff --git a/coderd/members.go b/coderd/members.go
@@ -9,12 +9,60 @@ import (
 
 	"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/coderd/rbac"
 	"github.com/coder/coder/v2/codersdk"
 )
 
+// @Summary Add organization member
+// @ID add-organization-member
+// @Security CoderSessionToken
+// @Accept json
+// @Produce json
+// @Tags Members
+// @Param organization path string true "Organization ID"
+// @Param user path string true "User ID, name, or me"
+// @Success 200 {object} codersdk.OrganizationMember
+// @Router /organizations/{organization}/members/{user} [post]
+func (api *API) postOrganizationMember(rw http.ResponseWriter, r *http.Request) {
+	var (
+		ctx          = r.Context()
+		organization = httpmw.OrganizationParam(r)
+		user         = httpmw.UserParam(r)
+	)
+
+	member, err := api.Database.InsertOrganizationMember(ctx, database.InsertOrganizationMemberParams{
+		OrganizationID: organization.ID,
+		UserID:         user.ID,
+		CreatedAt:      dbtime.Now(),
+		UpdatedAt:      dbtime.Now(),
+		Roles:          []string{},
+	})
+	if httpapi.Is404Error(err) {
+		httpapi.ResourceNotFound(rw)
+		return
+	}
+	if err != nil {
+		httpapi.InternalServerError(rw, err)
+		return
+	}
+
+	resp, err := convertOrganizationMembers(ctx, api.Database, []database.OrganizationMember{member})
+	if err != nil {
+		httpapi.InternalServerError(rw, err)
+		return
+	}
+
+	if len(resp) == 0 {
+		httpapi.InternalServerError(rw, xerrors.Errorf("marshal member"))
+		return
+	}
+
+	httpapi.Write(ctx, rw, http.StatusOK, resp[0])
+}
+
 // @Summary List organization members
 // @ID list-organization-members
 // @Security CoderSessionToken
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -379,6 +379,20 @@ func (c *Client) UpdateUserPassword(ctx context.Context, user string, req Update
 	return nil
 }
 
+// PostOrganizationMember adds a user to an organization
+func (c *Client) PostOrganizationMember(ctx context.Context, organizationID uuid.UUID, user string) (OrganizationMember, error) {
+	res, err := c.Request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/organizations/%s/members/%s", organizationID, user), nil)
+	if err != nil {
+		return OrganizationMember{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return OrganizationMember{}, ReadBodyAsError(res)
+	}
+	var member OrganizationMember
+	return member, json.NewDecoder(res.Body).Decode(&member)
+}
+
 // OrganizationMembers lists all members in an organization
 func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMemberWithName, error) {
 	res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/", organizationID), nil)

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ func (r RootCmd) organizations() serpent.Command {`
`29`	`29`	`r.currentOrganization(),`
`30`	`30`	`r.switchOrganization(),`
`31`	`31`	`r.createOrganization(),`
`32`		`- r.organizationRoles(),`
`33`	`32`	`r.organizationMembers(),`
	`33`	`+ r.organizationRoles(),`
`34`	`34`	`},`
`35`	`35`	`}`
`36`	`36`