Skip to content

The only tool you need to know what is happening and how to fix it.

A member can't remove member with the same role (#349)

Vuk2ceefeffeed8
diff --git a/backend/app/controllers/member.controller.go b/backend/app/controllers/member.controller.go
index ba51a57a..962a787c 100644
--- a/backend/app/controllers/member.controller.go
+++ b/backend/app/controllers/member.controller.go
@@ -1,13 +1,14 @@
package controllers
import (
+ "net/http"
+ "strconv"
+
"github.com/tracewayapp/traceway/backend/app/db"
"github.com/tracewayapp/traceway/backend/app/middleware"
"github.com/tracewayapp/traceway/backend/app/models"
"github.com/tracewayapp/traceway/backend/app/oncall"
"github.com/tracewayapp/traceway/backend/app/repositories/transactional"
- "net/http"
- "strconv"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
@@ -84,6 +85,11 @@ func (c *memberController) RemoveMember(ctx *gin.Context) {
return
}
+ currentUserRole, err := transactional.OrganizationRepository.GetUserRole(tx, organizationId, currentUserId)
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))
+ return
+ }
targetRole, err := transactional.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)
if err != nil {
ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))
@@ -99,6 +105,11 @@ func (c *memberController) RemoveMember(ctx *gin.Context) {
return
}
+ if targetRole == currentUserRole {
+ ctx.JSON(http.StatusForbidden, gin.H{"error": "Cannot remove the user with the same role"})
+ return
+ }
+
err = transactional.OrganizationRepository.RemoveUser(tx, organizationId, targetUserId)
if err != nil {
ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to remove member: %w", err))
diff --git a/frontend/src/routes/settings/users-tab.svelte b/frontend/src/routes/settings/users-tab.svelte
index 4c63bd98..e063226d 100644
--- a/frontend/src/routes/settings/users-tab.svelte
+++ b/frontend/src/routes/settings/users-tab.svelte
@@ -52,6 +52,7 @@
const invitations = $derived(organizationState.invitations.filter((i) => i.status === 'pending'));
const canInvite = $derived(organizationState.canInvite);
const isOwner = $derived(organizationState.isOwner);
+ const currentUserRole = $derived(organizationState.userRole);
const roleOptions = [
{ value: 'admin', label: 'Admin' },
@@ -165,7 +166,7 @@
}
function canRemoveMember(member: OrganizationMember): boolean {
- return member.role !== 'owner';
+ return member.role !== 'owner' && member.role !== currentUserRole;
}
function getRoleBadgeVariant(role: string): 'default' | 'secondary' | 'destructive' | 'outline' {