rogee/gochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(platform): align account user membership

Browse Source
This commit is contained in:
rogee
2026-06-06 02:00:15 +08:00
parent fbb405a7a0
commit 706c706ee4
6 changed files with 105 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/handler/api/v1/platform_account_user_handler.go
+25 -28
View File
@@ -2,6 +2,7 @@ package v1
import (
"net/http"
"strconv"
"github.com/gin-gonic/gin"
@@ -60,7 +61,7 @@ func (h *PlatformAccountUserHandler) Index(c *gin.Context) {
return
}
response.OK(c, accountUsers)
c.JSON(http.StatusOK, accountUsers)
}
// Create adds a user to an account.
@@ -84,39 +85,21 @@ func (h *PlatformAccountUserHandler) Create(c *gin.Context) {
}
var req struct {
UserID uint `json:"user_id" binding:"required"`
Role string `json:"role,omitempty"`
UserID uint `json:"user_id" form:"user_id" binding:"required"`
Role *string `json:"role,omitempty" form:"role"`
}
if err := c.ShouldBindJSON(&req); err != nil {
if err := c.ShouldBind(&req); err != nil {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, err.Error())
return
}
// Verify PlatformApp has permissible access to this user
userPerm, err := h.permissibleRepo.FindByPlatformAppAndResource(c.Request.Context(), platformAppID, model.PermissibleTypeUser, req.UserID)
if err != nil || userPerm == nil {
response.AbortWithStatusError(c, http.StatusForbidden, response.ErrForbidden, "non permissible resource for user")
return
}
role := req.Role
if role == "" {
role = "agent"
}
if err := h.accountRepo.AddUserToAccount(c.Request.Context(), accountID, req.UserID, role); err != nil {
acctUser, err := h.accountRepo.UpsertAccountUser(c.Request.Context(), accountID, req.UserID, req.Role)
if err != nil {
response.AbortWithStatusError(c, http.StatusInternalServerError, response.ErrInternal, err.Error())
return
}
// Return the created AccountUser
acctUser, err := h.accountRepo.FindAccountUserByUserAndAccount(c.Request.Context(), accountID, req.UserID)
if err != nil {
response.OK(c, gin.H{"account_id": accountID, "user_id": req.UserID, "role": role})
return
}
response.Created(c, acctUser)
c.JSON(http.StatusOK, acctUser)
}
// Destroy removes a user from an account.
@@ -130,8 +113,8 @@ func (h *PlatformAccountUserHandler) Destroy(c *gin.Context) {
return
}
userID, err := parseUintParam(c, "user_id")
if err != nil {
userID, err := platformAccountUserID(c)
if err != nil || userID == 0 {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, "invalid user ID")
return
}
@@ -150,5 +133,19 @@ func (h *PlatformAccountUserHandler) Destroy(c *gin.Context) {
return
}
response.NoContent(c)
c.Status(http.StatusOK)
}
func platformAccountUserID(c *gin.Context) (uint, error) {
if raw := c.Param("user_id"); raw != "" {
id, err := strconv.ParseUint(raw, 10, 32)
return uint(id), err
}
var req struct {
UserID uint `json:"user_id" form:"user_id"`
}
if err := c.ShouldBind(&req); err != nil {
return 0, err
}
return req.UserID, nil
}
internal/handler/api/v1/platform_e2e_test.go
+29 -2
View File
@@ -97,6 +97,7 @@ func setupPlatformTokenTestE2E(t *testing.T) (*gin.Engine, *repository.Permissib
// Gin wildcard constraint: nested routes under accounts/:id must reuse :id.
platformGroup.GET("/accounts/:id/account_users", platformAccountUser.Index)
platformGroup.POST("/accounts/:id/account_users", platformAccountUser.Create)
platformGroup.DELETE("/accounts/:id/account_users/destroy", platformAccountUser.Destroy)
platformGroup.DELETE("/accounts/:id/account_users/:user_id", platformAccountUser.Destroy)
return engine, permissibleRepo, userRepo, accountRepo
@@ -403,7 +404,22 @@ func TestPlatformAccountUserE2E_Create(t *testing.T) {
req.Header.Set("Content-Type", "application/json")
engine.ServeHTTP(w, req)
assert.Equal(t, http.StatusCreated, w.Code)
require.Equal(t, http.StatusOK, w.Code)
var accountUser map[string]interface{}
require.NoError(t, json.Unmarshal(w.Body.Bytes(), &accountUser))
assert.Equal(t, "agent", accountUser["role"])
assert.NotContains(t, accountUser, "success")
// Chatwoot find_or_initialize_by updates existing memberships instead of failing duplicates.
acctUserBody = fmt.Sprintf(`{"user_id": %s, "role": "administrator"}`, userID)
w = httptest.NewRecorder()
req, _ = http.NewRequest("POST", "/platform/api/v1/accounts/"+accountID+"/account_users", bytes.NewBufferString(acctUserBody))
req.Header.Set("Content-Type", "application/json")
engine.ServeHTTP(w, req)
require.Equal(t, http.StatusOK, w.Code)
require.NoError(t, json.Unmarshal(w.Body.Bytes(), &accountUser))
assert.Equal(t, "administrator", accountUser["role"])
}
func TestPlatformAccountUserE2E_Index(t *testing.T) {
@@ -435,12 +451,23 @@ func TestPlatformAccountUserE2E_Index(t *testing.T) {
req, _ = http.NewRequest("POST", "/platform/api/v1/accounts/"+accountID+"/account_users", bytes.NewBufferString(acctUserBody))
req.Header.Set("Content-Type", "application/json")
engine.ServeHTTP(w, req)
require.Equal(t, http.StatusCreated, w.Code)
require.Equal(t, http.StatusOK, w.Code)
// Index account_users
w = httptest.NewRecorder()
req, _ = http.NewRequest("GET", "/platform/api/v1/accounts/"+accountID+"/account_users", nil)
engine.ServeHTTP(w, req)
require.Equal(t, http.StatusOK, w.Code)
var accountUsers []map[string]interface{}
require.NoError(t, json.Unmarshal(w.Body.Bytes(), &accountUsers))
require.Len(t, accountUsers, 1)
assert.Equal(t, "agent", accountUsers[0]["role"])
assert.NotContains(t, accountUsers[0], "success")
// Chatwoot destroy is a collection route: DELETE /account_users/destroy with user_id param.
w = httptest.NewRecorder()
req, _ = http.NewRequest("DELETE", "/platform/api/v1/accounts/"+accountID+"/account_users/destroy?user_id="+userID, nil)
engine.ServeHTTP(w, req)
assert.Equal(t, http.StatusOK, w.Code)
}