add delete role endpoint

api/server/handlers/project/delete_role.go

@@ -0,0 +1,57 @@
+package project
+
+import (
+	"net/http"
+
+	"github.com/porter-dev/porter/api/server/handlers"
+	"github.com/porter-dev/porter/api/server/shared"
+	"github.com/porter-dev/porter/api/server/shared/apierrors"
+	"github.com/porter-dev/porter/api/server/shared/config"
+	"github.com/porter-dev/porter/api/types"
+	"github.com/porter-dev/porter/internal/models"
+)
+
+type ProjectDeleteRoleHandler struct {
+	handlers.PorterHandlerReadWriter
+}
+
+func NewProjectDeleteRoleHandler(
+	config *config.Config,
+	decoderValidator shared.RequestDecoderValidator,
+	writer shared.ResultWriter,
+) *ProjectDeleteRoleHandler {
+	return &ProjectDeleteRoleHandler{
+		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
+	}
+}
+
+func (p *ProjectDeleteRoleHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
+
+	request := &types.DeleteRoleRequest{}
+
+	ok := p.DecodeAndValidate(w, r, request)
+
+	if !ok {
+		return
+	}
+
+	role, err := p.Repo().Project().ReadProjectRole(proj.ID, request.UserID)
+
+	if err != nil {
+		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
+		return
+	}
+
+	role, err = p.Repo().Project().DeleteProjectRole(proj.ID, request.UserID)
+
+	if err != nil {
+		p.HandleAPIError(w, r, apierrors.NewErrInternal(err))
+	}
+
+	res := &types.DeleteRoleResponse{
+		Role: role.ToRoleType(),
+	}
+
+	p.WriteResult(w, r, res)
+}

api/server/router/project.go

@@ -245,7 +245,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/projects/{project_id}/roles -> project.NewProjectUpdateRoleHandler
+	// POST /api/projects/{project_id}/roles -> project.NewProjectUpdateRoleHandler
 	updateRoleEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbUpdate,
@@ -273,6 +273,34 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
+	// DELETE /api/projects/{project_id}/roles -> project.NewProjectDeleteRoleHandler
+	deleteRoleEndpoint := factory.NewAPIEndpoint(
+		&types.APIRequestMetadata{
+			Verb:   types.APIVerbDelete,
+			Method: types.HTTPVerbDelete,
+			Path: &types.Path{
+				Parent:       basePath,
+				RelativePath: relPath + "/roles",
+			},
+			Scopes: []types.PermissionScope{
+				types.UserScope,
+				types.ProjectScope,
+			},
+		},
+	)
+
+	deleteRoleHandler := project.NewProjectDeleteRoleHandler(
+		config,
+		factory.GetDecoderValidator(),
+		factory.GetResultWriter(),
+	)
+
+	routes = append(routes, &Route{
+		Endpoint: deleteRoleEndpoint,
+		Handler:  deleteRoleHandler,
+		Router:   r,
+	})
+
 	// GET /api/projects/{project_id}/registries -> registry.NewRegistryListHandler
 	listRegistriesEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{

api/types/project.go

@@ -46,10 +46,18 @@ type Collaborator struct {
 type ListCollaboratorsResponse []*Collaborator
 
 type UpdateRoleRequest struct {
-	UserID uint   `json:"user_id"`
-	Kind   string `json:"kind"`
+	UserID uint   `json:"user_id,required"`
+	Kind   string `json:"kind,required"`
 }
 
 type UpdateRoleResponse struct {
 	*Role
 }
+
+type DeleteRoleRequest struct {
+	UserID uint `schema:"user_id,required"`
+}
+
+type DeleteRoleResponse struct {
+	*Role
+}

dashboard/src/main/home/project-settings/InviteList.tsx

@@ -182,8 +182,8 @@ const InvitePage: React.FunctionComponent<Props> = ({}) => {
     try {
       api.removeCollaborator(
         "<token>",
-        {},
-        { project_id: currentProject.id, user_id }
+        { user_id },
+        { project_id: currentProject.id }
       );
       getData();
     } catch (error) {

dashboard/src/shared/api.tsx

@@ -1023,9 +1023,9 @@ const updateCollaborator = baseApi<
   { project_id: number }
 >("POST", ({ project_id }) => `/api/projects/${project_id}/roles`);
 
-const removeCollaborator = baseApi<{}, { project_id: number; user_id: number }>(
+const removeCollaborator = baseApi<{ user_id: number }, { project_id: number }>(
   "DELETE",
-  ({ project_id, user_id }) => `/api/projects/${project_id}/roles/${user_id}`
+  ({ project_id }) => `/api/projects/${project_id}/roles`
 );
 
 const getPolicyDocument = baseApi<{}, { project_id: number }>(

docs/developing/backend-refactor-status.md

@@ -138,7 +138,7 @@
 | <li>- [X] `GET /api/projects/{project_id}/releases/{name}/{revision}/pods/all`                                              | AB          |                 |             |                  |
 | <li>- [x] `GET /api/projects/{project_id}/roles`                                                                            | AS          |                 |             | yes              |
 | <li>- [x] `POST /api/projects/{project_id}/roles/{user_id}`                                                                 | AS          | yes             |             | yes              |
-| <li>- [ ] `DELETE /api/projects/{project_id}/roles/{user_id}`                                                               |             |                 |             |                  |
+| <li>- [x] `DELETE /api/projects/{project_id}/roles/{user_id}`                                                               |             |                 |             |                  |
 | <li>- [ ] `GET /api/projects/{project_id}/slack_integrations`                                                               |             |                 |             |                  |
 | <li>- [ ] `GET /api/projects/{project_id}/slack_integrations/exists`                                                        |             |                 |             |                  |
 | <li>- [ ] `DELETE /api/projects/{project_id}/slack_integrations/{slack_integration_id}`                                     |             |                 |             |                  |