Skip to content

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

fixes

ddux66f7755795de
diff --git a/CLAUDE.md b/CLAUDE.md
index adcd01fb..9d6bcf08 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -590,7 +590,7 @@ backend/
| Method | Endpoint | Auth | Purpose |
|--------|----------|------|---------|
| GET | `/api/projects` | App | List projects |
-| POST | `/api/projects` | App+Write | Create project (optional `organizationId` body field targets another org; the handler re-checks the caller's **org role** in the target org and 403s for non-members/`readonly` — creation is org-scoped, per-project overrides don't grant it) |
+| POST | `/api/projects` | App | Create project (optional `organizationId` body field targets another org; the handler checks the caller's **org role** in the target org and 403s for non-members/`readonly`; creation is org-scoped, so per-project overrides neither grant nor deny it) |
| POST | `/api/projects/source-map-token` | App+Write | Generate source map upload token |
**Dashboard**
diff --git a/backend/app/controllers/member.controller.go b/backend/app/controllers/member.controller.go
index b1c0c2e3..e5285dfe 100644
--- a/backend/app/controllers/member.controller.go
+++ b/backend/app/controllers/member.controller.go
@@ -5,7 +5,6 @@ import (
"github.com/tracewayapp/traceway/backend/app/middleware"
"github.com/tracewayapp/traceway/backend/app/models"
"github.com/tracewayapp/traceway/backend/app/repositories"
- "database/sql"
"net/http"
"strconv"
@@ -115,6 +114,7 @@ func (c *memberController) RemoveMember(ctx *gin.Context) {
}
func (c *memberController) GetProjectRoles(ctx *gin.Context) {
+ tx := db.GetTx(ctx)
organizationId := middleware.GetOrganizationId(ctx)
targetUserId, err := strconv.Atoi(ctx.Param("userId"))
@@ -123,40 +123,25 @@ func (c *memberController) GetProjectRoles(ctx *gin.Context) {
return
}
- type projectRolesData struct {
- OrgRole string
- ProjectRoles []*models.MemberProjectRole
- }
-
- data, err := db.ExecuteTransaction(func(tx *sql.Tx) (*projectRolesData, error) {
- orgRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)
- if err != nil {
- return nil, err
- }
- if orgRole == "" {
- return nil, nil
- }
-
- projectRoles, err := repositories.ProjectUserRoleRepository.FindByOrganizationAndUser(tx, organizationId, targetUserId)
- if err != nil {
- return nil, err
- }
-
- return &projectRolesData{OrgRole: orgRole, ProjectRoles: projectRoles}, nil
- })
-
+ orgRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)
if err != nil {
- ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to load member project roles: %w", err))
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))
return
}
- if data == nil {
+ if orgRole == "" {
ctx.JSON(http.StatusNotFound, gin.H{"error": "User is not a member of this organization"})
return
}
+ projectRoles, err := repositories.ProjectUserRoleRepository.FindByOrganizationAndUser(tx, organizationId, targetUserId)
+ if err != nil {
+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to load member project roles: %w", err))
+ return
+ }
+
ctx.JSON(http.StatusOK, gin.H{
- "orgRole": data.OrgRole,
- "projectRoles": data.ProjectRoles,
+ "orgRole": orgRole,
+ "projectRoles": projectRoles,
})
}
diff --git a/backend/app/controllers/routes.go b/backend/app/controllers/routes.go
index bbaae15f..ac4a5fe9 100644
--- a/backend/app/controllers/routes.go
+++ b/backend/app/controllers/routes.go
@@ -51,7 +51,7 @@ func RegisterControllers(router *gin.RouterGroup) {
otelGroup.POST("/v1development/profiles", middleware.CORSReport, middleware.UseClientAuth, otelcontrollers.OtelController.ExportProfiles)
router.GET("/projects", middleware.UseAppAuth, ProjectController.ListProjects)
- router.POST("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.CreateProject)
+ router.POST("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, ProjectController.CreateProject)
router.PUT("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.UpdateProject)
router.DELETE("/projects", middleware.UseAppAuth, middleware.RequireProjectAccess, middleware.RequireWriteAccess, ProjectController.DeleteProject)
@@ -172,7 +172,7 @@ func RegisterControllers(router *gin.RouterGroup) {
router.PUT("/organizations/:organizationId/members/:userId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.UpdateRole)
router.DELETE("/organizations/:organizationId/members/:userId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.RemoveMember)
- router.GET("/organizations/:organizationId/members/:userId/project-roles", middleware.UseAppAuth, middleware.RequireAdminAccess, MemberController.GetProjectRoles)
+ router.GET("/organizations/:organizationId/members/:userId/project-roles", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.GetProjectRoles)
router.PUT("/organizations/:organizationId/members/:userId/project-roles/:projectId", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, MemberController.UpdateProjectRole)
router.POST("/organizations/:organizationId/invitations", middleware.UseAppAuth, middleware.RequireAdminAccess, middleware.Transactional, InvitationController.InviteUser)
diff --git a/backend/app/migrations/pg/0053_add_project_user_roles_user_id_index.up.sql b/backend/app/migrations/pg/0053_add_project_user_roles_user_id_index.up.sql
new file mode 100644
index 00000000..6aaba6d0
--- /dev/null
+++ b/backend/app/migrations/pg/0053_add_project_user_roles_user_id_index.up.sql
@@ -0,0 +1 @@
+CREATE INDEX IF NOT EXISTS idx_project_user_roles_user_id ON project_user_roles(user_id)
diff --git a/backend/app/models/organization.model.go b/backend/app/models/organization.model.go
index 917f9fcb..6cac0809 100644
--- a/backend/app/models/organization.model.go
+++ b/backend/app/models/organization.model.go
@@ -41,7 +41,6 @@ type UpdateMemberRoleRequest struct {
Role string `json:"role" binding:"required,oneof=admin user readonly"`
}
-// UpdateProjectRoleRequest is the request body for setting a member's per-project role override
type UpdateProjectRoleRequest struct {
Role string `json:"role" binding:"required,oneof=default user readonly"`
}
diff --git a/backend/app/models/project_user_role.model.go b/backend/app/models/project_user_role.model.go
index 00040a56..5a19cd49 100644
--- a/backend/app/models/project_user_role.model.go
+++ b/backend/app/models/project_user_role.model.go
@@ -10,7 +10,7 @@ type ProjectUserRole struct {
Id int `json:"id"`
ProjectId uuid.UUID `json:"projectId"`
UserId int `json:"userId"`
- Role string `json:"role"` // user, readonly
+ Role string `json:"role"`
CreatedAt time.Time `json:"createdAt"`
}
diff --git a/frontend/src/routes/settings/+page.ts b/frontend/src/routes/settings/+page.ts
index d51d31ac..91ecb20b 100644
--- a/frontend/src/routes/settings/+page.ts
+++ b/frontend/src/routes/settings/+page.ts
@@ -1,13 +1,11 @@
import { redirect } from '@sveltejs/kit';
+import { authState } from '$lib/state/auth.svelte';
import type { PageLoad } from './$types';
export const prerender = false;
export const load: PageLoad = () => {
- const organizations: { role: string }[] = JSON.parse(
- localStorage.getItem('USER_ORGANIZATIONS') || '[]'
- );
- const canManage = organizations.some((o) => o.role === 'owner' || o.role === 'admin');
+ const canManage = authState.organizations.some((o) => o.role === 'owner' || o.role === 'admin');
if (!canManage) {
throw redirect(302, '/');
}