release 1.1.0 : sync V2 (upload, download, purge, placements, rétention, groupes)
Release / release-apk (push) Successful in 9m25s
Release / release-docker (push) Successful in 33s
CI / docker (push) Successful in 7s
CI / lint-backend (push) Successful in 1m29s
CI / lint-mobile (push) Failing after 7m46s
CI / test-backend (push) Successful in 1m30s
CI / test-mobile (push) Successful in 9m27s
CI / build-backend (push) Successful in 47s
Release / release-apk (push) Successful in 9m25s
Release / release-docker (push) Successful in 33s
CI / docker (push) Successful in 7s
CI / lint-backend (push) Successful in 1m29s
CI / lint-mobile (push) Failing after 7m46s
CI / test-backend (push) Successful in 1m30s
CI / test-mobile (push) Successful in 9m27s
CI / build-backend (push) Successful in 47s
This commit is contained in:
@@ -0,0 +1,143 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"github.com/kazier/backend/pkg/api"
|
||||
"github.com/kazier/backend/service"
|
||||
)
|
||||
|
||||
// groupIDParam validates a 32-hex group id path param (404, never 400 —
|
||||
// group ids are unguessable, no enumeration).
|
||||
func groupIDParam(c *gin.Context, name string) (string, bool) {
|
||||
id := c.Param(name)
|
||||
if !deviceIDPattern.MatchString(id) {
|
||||
api.Error(c, http.StatusNotFound, "NOT_FOUND", "group not found")
|
||||
return "", false
|
||||
}
|
||||
return id, true
|
||||
}
|
||||
|
||||
// GroupsCreate stores an owned group : POST /groups {name}.
|
||||
func GroupsCreate(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&body); err != nil {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid JSON body")
|
||||
return
|
||||
}
|
||||
dto, err := Store.CreateGroup(c.GetString(UserIDKey), body.Name)
|
||||
if err != nil {
|
||||
if errors.Is(err, service.ErrInvalidUpload) {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid group name")
|
||||
return
|
||||
}
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, dto)
|
||||
}
|
||||
|
||||
// GroupsList returns owned + joined groups : GET /groups.
|
||||
func GroupsList(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
dtos, err := Store.ListGroups(c.GetString(UserIDKey))
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, dtos)
|
||||
}
|
||||
|
||||
// GroupMembersAdd adds an existing user : POST /groups/:id/members {userId}.
|
||||
func GroupMembersAdd(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
groupID, ok := groupIDParam(c, "id")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
UserID string `json:"userId"`
|
||||
}
|
||||
if err := c.ShouldBindJSON(&body); err != nil || !deviceIDPattern.MatchString(body.UserID) {
|
||||
api.Error(c, http.StatusBadRequest, "INVALID_REQUEST", "invalid `userId`")
|
||||
return
|
||||
}
|
||||
if err := Store.AddGroupMember(c.GetString(UserIDKey), groupID, body.UserID); err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, gin.H{"id": groupID})
|
||||
}
|
||||
|
||||
// GroupMembersRemove removes a membership :
|
||||
// DELETE /groups/:id/members/:userId.
|
||||
func GroupMembersRemove(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
groupID, ok := groupIDParam(c, "id")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
memberID, ok := groupIDParam(c, "userId")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if err := Store.RemoveGroupMember(c.GetString(UserIDKey), groupID, memberID); err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, gin.H{"id": groupID})
|
||||
}
|
||||
|
||||
// GroupsDelete removes an owned group : DELETE /groups/:id.
|
||||
func GroupsDelete(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
groupID, ok := groupIDParam(c, "id")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if err := Store.DeleteGroup(c.GetString(UserIDKey), groupID); err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, gin.H{"id": groupID})
|
||||
}
|
||||
|
||||
// GroupMembersList returns memberships of an owned group :
|
||||
// GET /groups/:id/members.
|
||||
func GroupMembersList(c *gin.Context) {
|
||||
if Store == nil {
|
||||
api.Error(c, http.StatusServiceUnavailable, "SERVICE_UNAVAILABLE", "backend not initialized")
|
||||
return
|
||||
}
|
||||
groupID, ok := groupIDParam(c, "id")
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
members, err := Store.ListMembers(c.GetString(UserIDKey), groupID)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
api.OK(c, members)
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
package handlers_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/kazier/backend/repository"
|
||||
)
|
||||
|
||||
// V2-6 : CRUD groupes + membres via HTTP, scoping owner, 404 sans énumération.
|
||||
func TestGroupsHttpFlow(t *testing.T) {
|
||||
r, _, repo := setup(t)
|
||||
ownerDevice := repository.NewID()
|
||||
ownerToken, _ := registerAndLogin(t, r, repo, testUserUsername(ownerDevice, "go"), "groups-http-password", ownerDevice)
|
||||
otherDevice := repository.NewID()
|
||||
otherToken, _ := registerAndLogin(t, r, repo, testUserUsername(otherDevice, "gx"), "groups-http-password-b", otherDevice)
|
||||
|
||||
// Création (nom trimé).
|
||||
rec, _ := doRequest(t, r, http.MethodPost, "/api/v1/groups", ownerToken, []byte(`{"name":" Famille "}`), "application/json")
|
||||
env := expectOK(t, rec, "groups-create")
|
||||
var created struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Role string `json:"role"`
|
||||
}
|
||||
if err := json.Unmarshal(env.Data, &created); err != nil {
|
||||
t.Fatalf("groups-create: unmarshal: %v", err)
|
||||
}
|
||||
if created.Name != "Famille" || created.Role != "owner" {
|
||||
t.Errorf("groups-create = %+v", created)
|
||||
}
|
||||
// Nom vide → 400.
|
||||
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/groups", ownerToken, []byte(`{"name":" "}`), "application/json")
|
||||
expectError(t, rec, http.StatusBadRequest, "INVALID_REQUEST", "groups-create-blank")
|
||||
|
||||
// Liste owner (1, owner) ; tiers (0).
|
||||
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups", ownerToken, nil, "")
|
||||
env = expectOK(t, rec, "groups-list-owner")
|
||||
var listed []map[string]any
|
||||
if err := json.Unmarshal(env.Data, &listed); err != nil {
|
||||
t.Fatalf("groups-list: unmarshal: %v", err)
|
||||
}
|
||||
if len(listed) != 1 {
|
||||
t.Errorf("groups-list-owner = %d, attendu 1", len(listed))
|
||||
}
|
||||
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups", otherToken, nil, "")
|
||||
env = expectOK(t, rec, "groups-list-other")
|
||||
listed = nil
|
||||
if err := json.Unmarshal(env.Data, &listed); err != nil {
|
||||
t.Fatalf("groups-list-other: unmarshal: %v", err)
|
||||
}
|
||||
if len(listed) != 0 {
|
||||
t.Errorf("groups-list-other = %d, attendu 0", len(listed))
|
||||
}
|
||||
|
||||
// Ajout membre : besoin d'un user existant — on le crée via un login.
|
||||
memberDevice := repository.NewID()
|
||||
_, memberID := registerAndLogin(t, r, repo, testUserUsername(memberDevice, "gm"), "groups-http-password-c", memberDevice)
|
||||
rec, _ = doRequest(
|
||||
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", ownerToken,
|
||||
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json",
|
||||
)
|
||||
expectOK(t, rec, "groups-add-member")
|
||||
// Liste membres (owner) : le membre ajouté ; tiers → 404.
|
||||
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups/"+created.ID+"/members", ownerToken, nil, "")
|
||||
envMembers := expectOK(t, rec, "groups-list-members")
|
||||
var members []map[string]any
|
||||
if err := json.Unmarshal(envMembers.Data, &members); err != nil {
|
||||
t.Fatalf("groups-list-members: unmarshal: %v", err)
|
||||
}
|
||||
if len(members) != 1 || members[0]["id"] != memberID {
|
||||
t.Errorf("groups-list-members = %v, attendu 1 membre", members)
|
||||
}
|
||||
rec, _ = doRequest(t, r, http.MethodGet, "/api/v1/groups/"+created.ID+"/members", otherToken, nil, "")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-list-members-other")
|
||||
// Non-owner → 404.
|
||||
rec, _ = doRequest(
|
||||
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", otherToken,
|
||||
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json",
|
||||
)
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-add-other")
|
||||
// Membre inconnu → GRANTEE_NOT_FOUND.
|
||||
rec, _ = doRequest(
|
||||
t, r, http.MethodPost, "/api/v1/groups/"+created.ID+"/members", ownerToken,
|
||||
[]byte(fmt.Sprintf(`{"userId":%q}`, repository.NewID())), "application/json",
|
||||
)
|
||||
expectError(t, rec, http.StatusNotFound, "GRANTEE_NOT_FOUND", "groups-add-unknown")
|
||||
|
||||
// Groupe inconnu → 404 partout (pas d'énumération).
|
||||
unknown := repository.NewID()
|
||||
rec, _ = doRequest(t, r, http.MethodPost, "/api/v1/groups/"+unknown+"/members", ownerToken,
|
||||
[]byte(fmt.Sprintf(`{"userId":%q}`, memberID)), "application/json")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-add-unknown-group")
|
||||
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+unknown, ownerToken, nil, "")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-delete-unknown")
|
||||
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/not-hex", ownerToken, nil, "")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-invalid-id")
|
||||
|
||||
// Retrait puis suppression.
|
||||
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID+"/members/"+memberID, ownerToken, nil, "")
|
||||
expectOK(t, rec, "groups-remove-member")
|
||||
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID, otherToken, nil, "")
|
||||
expectError(t, rec, http.StatusNotFound, "NOT_FOUND", "groups-delete-other")
|
||||
rec, _ = doRequest(t, r, http.MethodDelete, "/api/v1/groups/"+created.ID, ownerToken, nil, "")
|
||||
expectOK(t, rec, "groups-delete")
|
||||
}
|
||||
@@ -43,6 +43,13 @@ func RegisterRoutes(r *gin.Engine) {
|
||||
protected.GET("/users/resolve", ResolveUser)
|
||||
protected.PATCH("/users/me/password", ChangePassword)
|
||||
|
||||
protected.POST("/groups", GroupsCreate)
|
||||
protected.GET("/groups", GroupsList)
|
||||
protected.POST("/groups/:id/members", GroupMembersAdd)
|
||||
protected.GET("/groups/:id/members", GroupMembersList)
|
||||
protected.DELETE("/groups/:id/members/:userId", GroupMembersRemove)
|
||||
protected.DELETE("/groups/:id", GroupsDelete)
|
||||
|
||||
protected.POST("/ocr/jobs", OcrJobsCreate)
|
||||
protected.GET("/ocr/jobs/:id", OcrJobsGet)
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@ func writeError(c *gin.Context, err error) {
|
||||
api.Error(c, 404, "NOT_FOUND", "resource not found")
|
||||
case errors.Is(err, repository.ErrGranteeNotFound):
|
||||
api.Error(c, 404, "GRANTEE_NOT_FOUND", "the specified user does not exist")
|
||||
case errors.Is(err, repository.ErrGroupNotFound):
|
||||
api.Error(c, 404, "GROUP_NOT_FOUND", "the specified group does not exist")
|
||||
case errors.Is(err, repository.ErrNameConflict):
|
||||
api.Error(c, 409, "NAME_CONFLICT", "a resource with this name already exists here")
|
||||
case errors.Is(err, service.ErrFileTooLarge):
|
||||
|
||||
Reference in New Issue
Block a user