The only tool you need to know what is happening and how to fix it.
Go alertingexception-trackerissue-trackinglogsmetricsmonitoringobservability-platformopen-telemetryotelsession-replaytelemetrytraces
Merge branch 'main' into project-user-access
ddux7a4ccf462861
diff --cc backend/app/controllers/member.controller.goindex e5285dfe,4bfd2391..9fd6b24b--- a/backend/app/controllers/member.controller.go+++ b/backend/app/controllers/member.controller.go@@@ -104,104 -103,7 +104,104 @@@ func (c *memberController) RemoveMemberreturn}- err = repositories.ProjectUserRoleRepository.DeleteByOrganizationAndUser(tx, organizationId, targetUserId)++ err = transactional.ProjectUserRoleRepository.DeleteByOrganizationAndUser(tx, organizationId, targetUserId)+ if err != nil {+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to remove member project roles: %w", err))+ return+ }+ctx.JSON(http.StatusOK, gin.H{"message": "Member removed"})}+func (c *memberController) GetProjectRoles(ctx *gin.Context) {+ tx := db.GetTx(ctx)+ organizationId := middleware.GetOrganizationId(ctx)++ targetUserId, err := strconv.Atoi(ctx.Param("userId"))+ if err != nil {+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID"})+ return+ }+- orgRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)++ orgRole, err := transactional.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)+ if err != nil {+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))+ return+ }+ 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)++ projectRoles, err := transactional.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": orgRole,+ "projectRoles": projectRoles,+ })+}++func (c *memberController) UpdateProjectRole(ctx *gin.Context) {+ tx := db.GetTx(ctx)+ organizationId := middleware.GetOrganizationId(ctx)++ targetUserId, err := strconv.Atoi(ctx.Param("userId"))+ if err != nil {+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID"})+ return+ }++ projectId, err := uuid.Parse(ctx.Param("projectId"))+ if err != nil {+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid project ID"})+ return+ }++ var request models.UpdateProjectRoleRequest+ if err := ctx.ShouldBindJSON(&request); err != nil {+ ctx.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"})+ return+ }+- project, err := repositories.ProjectRepository.FindById(tx, projectId)++ project, err := transactional.ProjectRepository.FindById(tx, projectId)+ if err != nil {+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to load project: %w", err))+ return+ }+ if project == nil || project.OrganizationId == nil || *project.OrganizationId != organizationId {+ ctx.JSON(http.StatusNotFound, gin.H{"error": "Project not found in this organization"})+ return+ }+- targetRole, err := repositories.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)++ targetRole, err := transactional.OrganizationRepository.GetUserRole(tx, organizationId, targetUserId)+ if err != nil {+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to get user role: %w", err))+ return+ }+ if targetRole == "" {+ ctx.JSON(http.StatusNotFound, gin.H{"error": "User is not a member of this organization"})+ return+ }+ if targetRole == "owner" || targetRole == "admin" {+ ctx.JSON(http.StatusUnprocessableEntity, gin.H{"error": "Owners and admins always have full access to every project"})+ return+ }++ if request.Role == "default" {- err = repositories.ProjectUserRoleRepository.Delete(tx, projectId, targetUserId)++ err = transactional.ProjectUserRoleRepository.Delete(tx, projectId, targetUserId)+ } else {- err = repositories.ProjectUserRoleRepository.Upsert(tx, projectId, targetUserId, request.Role)++ err = transactional.ProjectUserRoleRepository.Upsert(tx, projectId, targetUserId, request.Role)+ }+ if err != nil {+ ctx.AbortWithError(http.StatusInternalServerError, traceway.NewStackTraceErrorf("Failed to update project role: %w", err))+ return+ }++ ctx.JSON(http.StatusOK, gin.H{"message": "Project role updated"})+}+var MemberController = memberController{}diff --cc backend/app/controllers/project.controller.goindex cec43018,39e0b20f..052acbc2--- a/backend/app/controllers/project.controller.go+++ b/backend/app/controllers/project.controller.go@@@ -87,13 -87,10 +87,13 @@@ func cleanProfileLabelAllowlist(in []sttype projectController struct{}type CreateProjectRequest struct {- Name string `json:"name" binding:"required"`- Name string `json:"name"`- Framework string `json:"framework" binding:"required"`++ Name string `json:"name"`+ Framework string `json:"framework" binding:"required"`+ OrganizationId *int `json:"organizationId"`}+var errNoOrgCreateAccess = errors.New("no create access in target organization")+type UpdateProjectRequest struct {Name string `json:"name" binding:"required"`Framework string `json:"framework" binding:"required"`@@@ -151,42 -148,22 +151,42 @@@ func (p projectController) CreateProjecreturn}+ userId := middleware.GetUserId(c)+project, err := db.ExecuteTransaction(func(tx *sql.Tx) (*models.Project, error) {- currentProject, err := repositories.ProjectRepository.FindById(tx, projectId)+ currentProject, err := transactional.ProjectRepository.FindById(tx, projectId)if err != nil {return nil, err}if currentProject == nil || currentProject.OrganizationId == nil {return nil, fmt.Errorf("current project has no organization")}++ targetOrgId := *currentProject.OrganizationId+ if request.OrganizationId != nil {+ targetOrgId = *request.OrganizationId+ }+- role, err := repositories.OrganizationRepository.GetUserRole(tx, targetOrgId, userId)++ role, err := transactional.OrganizationRepository.GetUserRole(tx, targetOrgId, userId)+ if err != nil {+ return nil, err+ }+ if role == "" || role == "readonly" {+ return nil, errNoOrgCreateAccess+ }+if ProjectLimitHook != nil {- if err := ProjectLimitHook(tx, *currentProject.OrganizationId); err != nil {+ if err := ProjectLimitHook(tx, targetOrgId); err != nil {return nil, err}}- return repositories.ProjectRepository.CreateWithOrganization(tx, request.Name, request.Framework, targetOrgId)- return transactional.ProjectRepository.CreateWithOrganization(tx, request.Name, request.Framework, *currentProject.OrganizationId)++ return transactional.ProjectRepository.CreateWithOrganization(tx, request.Name, request.Framework, targetOrgId)})if err != nil {+ if errors.Is(err, errNoOrgCreateAccess) {+ c.JSON(http.StatusForbidden, gin.H{"error": "You don't have permission to create projects in this organization"})+ return+ }var limitErr *LimitExceededErrorif errors.As(err, &limitErr) {c.JSON(http.StatusUnprocessableEntity, gin.H{"error": limitErr.Message})diff --cc backend/app/middleware/require_write_access.middleware.goindex ec924099,ae8ec19a..b2879321--- a/backend/app/middleware/require_write_access.middleware.go+++ b/backend/app/middleware/require_write_access.middleware.go@@@ -43,7 -43,7 +43,7 @@@ func InitRequireWriteAccess()}role, err := db.ExecuteTransaction(func(tx *sql.Tx) (string, error) {- return repositories.ProjectRepository.GetEffectiveRole(tx, projectId, userId)- return transactional.OrganizationRepository.GetUserRole(tx, *project.OrganizationId, userId)++ return transactional.ProjectRepository.GetEffectiveRole(tx, projectId, userId)})if err != nil {diff --cc backend/app/repositories/transactional/pg/project.repository.goindex 30859b36,04149389..ae4a283e--- a/backend/app/repositories/transactional/pg/project.repository.go+++ b/backend/app/repositories/transactional/pg/project.repository.go@@@ -271,10 -234,9 +274,10 @@@ func (p *projectRepository) Delete(tx *"widget_groups","source_maps","metric_registry",+ "project_user_roles",}for _, table := range related {- if err := lit.Delete(tx, "DELETE FROM "+table+" WHERE project_id = $1", id); err != nil {+ if err := lit.DeleteNamed(db.Driver, tx, "DELETE FROM "+table+" WHERE project_id = :project_id", lit.P{"project_id": id}); err != nil {return fmt.Errorf("deleting %s: %w", table, err)}}diff --cc backend/app/repositories/transactional/pg/project_user_role.repository.goindex 0f87a2ab,00000000..c897d56dmode 100644,000000..100644--- a/backend/app/repositories/transactional/pg/project_user_role.repository.go+++ b/backend/app/repositories/transactional/pg/project_user_role.repository.go@@@ -1,67 -1,0 +1,69 @@@- package repositories++//go:build transactional_pg++++package pg++import (+ "database/sql"+ "time"++ "github.com/tracewayapp/traceway/backend/app/db"+ "github.com/tracewayapp/traceway/backend/app/models"++ "github.com/google/uuid"+ "github.com/tracewayapp/lit/v2"+)++type projectUserRoleRepository struct{}++func (r *projectUserRoleRepository) FindByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) ([]*models.MemberProjectRole, error) {+ return lit.SelectNamed[models.MemberProjectRole](+ tx,+ `SELECT p.id as project_id, p.name, p.framework, pur.role+ FROM projects p+ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id+ WHERE p.organization_id = :org_id+ ORDER BY p.created_at ASC`,+ lit.P{"org_id": organizationId, "user_id": userId},+ )+}++func (r *projectUserRoleRepository) Upsert(tx *sql.Tx, projectId uuid.UUID, userId int, role string) error {+ query, args, err := lit.ParseNamedQuery(+ db.Driver,+ `INSERT INTO project_user_roles (project_id, user_id, role, created_at)+ VALUES (:project_id, :user_id, :role, :created_at)+ ON CONFLICT (project_id, user_id) DO UPDATE SET role = :role`,+ lit.P{+ "project_id": projectId,+ "user_id": userId,+ "role": role,+ "created_at": time.Now().UTC(),+ },+ )+ if err != nil {+ return err+ }+ return lit.UpdateNative(tx, query, args...)+}++func (r *projectUserRoleRepository) Delete(tx *sql.Tx, projectId uuid.UUID, userId int) error {+ return lit.DeleteNamed(+ db.Driver,+ tx,+ "DELETE FROM project_user_roles WHERE project_id = :project_id AND user_id = :user_id",+ lit.P{"project_id": projectId, "user_id": userId},+ )+}++func (r *projectUserRoleRepository) DeleteByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) error {+ return lit.DeleteNamed(+ db.Driver,+ tx,+ `DELETE FROM project_user_roles+ WHERE user_id = :user_id+ AND project_id IN (SELECT id FROM projects WHERE organization_id = :org_id)`,+ lit.P{"user_id": userId, "org_id": organizationId},+ )+}++var ProjectUserRoleRepository = projectUserRoleRepository{}diff --cc backend/app/repositories/transactional/sqlite/project.repository.goindex 00000000,35231644..d849fad6mode 000000,100644..100644--- a/backend/app/repositories/transactional/sqlite/project.repository.go+++ b/backend/app/repositories/transactional/sqlite/project.repository.go@@@ -1,0 -1,268 +1,309 @@@+ //go:build !transactional_pg++ package sqlite++ import (+ "database/sql"+ "fmt"+ "strings"+ "time"++ "github.com/tracewayapp/traceway/backend/app/db"+ "github.com/tracewayapp/traceway/backend/app/models"++ "github.com/google/uuid"+ "github.com/tracewayapp/lit/v2"+ )++ type projectRepository struct{}++ type projectWithRole struct {+ Id uuid.UUID `lit:"id"`+ Name string `lit:"name"`+ Token string `lit:"token"`+ Framework string `lit:"framework"`+ OrganizationId *int `lit:"organization_id"`+ CreatedAt time.Time `lit:"created_at"`+ SourceMapToken *string `lit:"source_map_token"`+ DropHealthyHealthchecks bool `lit:"drop_healthy_healthchecks"`+ HealthcheckPaths models.StringSlice `lit:"healthcheck_paths"`+ ProfileLabelAllowlist models.StringSlice `lit:"profile_label_allowlist"`+ Role string `lit:"role"`++ OverrideRole *string `lit:"override_role"`++}++++type effectiveRoleRow struct {++ OrgRole string `lit:"org_role"`++ OverrideRole *string `lit:"override_role"`+ }++ func init() {+ models.ExtensionModelRegistrations = append(models.ExtensionModelRegistrations, func(driver lit.Driver) {+ lit.RegisterModel[projectWithRole](driver)++ lit.RegisterModel[effectiveRoleRow](driver)+ })+ }+++func effectiveRole(orgRole string, overrideRole *string) string {++ if orgRole == "owner" || orgRole == "admin" {++ return orgRole++ }++ if overrideRole != nil {++ return *overrideRole++ }++ return orgRole++}+++ func (p *projectRepository) FindAllWithBackendUrlByUserId(tx *sql.Tx, userId int) ([]*models.ProjectWithBackendUrl, error) {+ rows, err := lit.SelectNamed[projectWithRole](+ tx,- `SELECT DISTINCT p.id, p.name, p.token, p.framework, p.organization_id, p.created_at, p.source_map_token, p.drop_healthy_healthchecks, p.healthcheck_paths, p.profile_label_allowlist, ou.role++ `SELECT DISTINCT p.id, p.name, p.token, p.framework, p.organization_id, p.created_at, p.source_map_token, p.drop_healthy_healthchecks, p.healthcheck_paths, p.profile_label_allowlist, ou.role, pur.role as override_role+ FROM projects p+ INNER JOIN organization_users ou ON p.organization_id = ou.organization_id++ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id+ WHERE ou.user_id = :user_id+ ORDER BY p.created_at ASC`,+ lit.P{"user_id": userId},+ )+ if err != nil {+ return nil, err+ }++ result := make([]*models.ProjectWithBackendUrl, 0, len(rows))+ for _, row := range rows {++ role := effectiveRole(row.Role, row.OverrideRole)+ token := row.Token+ sourceMapToken := row.SourceMapToken- if row.Role == "readonly" {++ if role == "readonly" {+ token = "read-only-hidden-token"+ sourceMapToken = nil+ }++ project := models.Project{+ Id: row.Id,+ Name: row.Name,+ Token: token,+ Framework: row.Framework,+ OrganizationId: row.OrganizationId,+ CreatedAt: row.CreatedAt,+ SourceMapToken: sourceMapToken,+ DropHealthyHealthchecks: row.DropHealthyHealthchecks,+ HealthcheckPaths: row.HealthcheckPaths,+ ProfileLabelAllowlist: row.ProfileLabelAllowlist,+ }- result = append(result, project.ToProjectWithBackendUrl())++ projectWithUrl := project.ToProjectWithBackendUrl()++ projectWithUrl.Role = role++ result = append(result, projectWithUrl)+ }++ return result, nil+ }+++func (p *projectRepository) GetEffectiveRole(tx *sql.Tx, projectId uuid.UUID, userId int) (string, error) {++ row, err := lit.SelectSingleNamed[effectiveRoleRow](++ tx,++ `SELECT ou.role as org_role, pur.role as override_role++ FROM projects p++ INNER JOIN organization_users ou ON ou.organization_id = p.organization_id AND ou.user_id = :user_id++ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id++ WHERE p.id = :project_id`,++ lit.P{"user_id": userId, "project_id": projectId},++ )++ if err != nil {++ return "", err++ }++ if row == nil {++ return "", nil++ }++ return effectiveRole(row.OrgRole, row.OverrideRole), nil++}+++ func (p *projectRepository) FindAll(tx *sql.Tx) ([]*models.Project, error) {+ return lit.Select[models.Project](+ tx,+ "SELECT id, name, token, framework, organization_id, created_at, source_map_token, drop_healthy_healthchecks, healthcheck_paths, profile_label_allowlist FROM projects ORDER BY created_at ASC",+ )+ }++ func (p *projectRepository) FindByToken(tx *sql.Tx, token string) (*models.Project, error) {+ return lit.SelectSingleNamed[models.Project](+ tx,+ "SELECT id, name, token, framework, organization_id, created_at, source_map_token, drop_healthy_healthchecks, healthcheck_paths, profile_label_allowlist FROM projects WHERE token = :token",+ lit.P{"token": token},+ )+ }++ func (p *projectRepository) FindById(tx *sql.Tx, id uuid.UUID) (*models.Project, error) {+ return lit.SelectSingleNamed[models.Project](+ tx,+ "SELECT id, name, token, framework, organization_id, created_at, source_map_token, drop_healthy_healthchecks, healthcheck_paths, profile_label_allowlist FROM projects WHERE id = :id",+ lit.P{"id": id},+ )+ }++ func (p *projectRepository) Create(tx *sql.Tx, name string, framework string) (*models.Project, error) {+ project := &models.Project{+ Id: uuid.New(),+ Name: name,+ Token: generateSecureToken(),+ Framework: framework,+ CreatedAt: time.Now().UTC(),+ DropHealthyHealthchecks: true,+ }++ err := lit.InsertExistingUuid(tx, project)+ if err != nil {+ return nil, err+ }++ return project, nil+ }++ func (p *projectRepository) CreateWithOrganization(tx *sql.Tx, name string, framework string, organizationId int) (*models.Project, error) {+ project := &models.Project{+ Id: uuid.New(),+ Name: name,+ Token: generateSecureToken(),+ Framework: framework,+ OrganizationId: &organizationId,+ CreatedAt: time.Now().UTC(),+ DropHealthyHealthchecks: true,+ ProfileLabelAllowlist: models.StringSlice{},+ }++ if frameworkRequiresSymbolUpload(framework) {+ token := generateSecureToken()+ project.SourceMapToken = &token+ }++ err := lit.InsertExistingUuid(tx, project)+ if err != nil {+ return nil, err+ }++ return project, nil+ }++ func (p *projectRepository) FindByOrganizationId(tx *sql.Tx, organizationId int) ([]*models.Project, error) {+ return lit.SelectNamed[models.Project](+ tx,+ "SELECT id, name, token, framework, organization_id, created_at, source_map_token, drop_healthy_healthchecks, healthcheck_paths, profile_label_allowlist FROM projects WHERE organization_id = :org_id ORDER BY created_at ASC",+ lit.P{"org_id": organizationId},+ )+ }++ func (p *projectRepository) FindByUserId(tx *sql.Tx, userId int) ([]*models.Project, error) {+ return lit.SelectNamed[models.Project](+ tx,+ `SELECT DISTINCT p.id, p.name, p.token, p.framework, p.organization_id, p.created_at, p.source_map_token, p.drop_healthy_healthchecks, p.healthcheck_paths, p.profile_label_allowlist+ FROM projects p+ INNER JOIN organization_users ou ON p.organization_id = ou.organization_id+ WHERE ou.user_id = :user_id+ ORDER BY p.created_at ASC`,+ lit.P{"user_id": userId},+ )+ }++ func (p *projectRepository) UserHasAccess(tx *sql.Tx, projectId uuid.UUID, userId int) (bool, error) {+ result, err := lit.SelectSingleNamed[models.CountResult](+ tx,+ `SELECT COUNT(*) as count+ FROM projects p+ INNER JOIN organization_users ou ON p.organization_id = ou.organization_id+ WHERE p.id = :project_id AND ou.user_id = :user_id`,+ lit.P{"project_id": projectId, "user_id": userId},+ )+ if err != nil {+ return false, err+ }+ if result == nil {+ return false, nil+ }++ return result.Count > 0, nil+ }++ func (p *projectRepository) GenerateSourceMapToken(tx *sql.Tx, projectId uuid.UUID) (string, error) {+ project, err := p.FindById(tx, projectId)+ if err != nil {+ return "", err+ }+ if project == nil {+ return "", fmt.Errorf("project not found: %s", projectId)+ }++ token := generateSecureToken()+ project.SourceMapToken = &token+ err = lit.UpdateNamed[models.Project](tx, project, "id = :id", lit.P{"id": projectId})+ if err != nil {+ return "", err+ }+ return token, nil+ }++ func (p *projectRepository) Update(tx *sql.Tx, id uuid.UUID, name string, framework string, dropHealthyHealthchecks *bool, healthcheckPaths *[]string, profileLabelAllowlist *[]string) (*models.Project, error) {+ project, err := p.FindById(tx, id)+ if err != nil {+ return nil, err+ }+ if project == nil {+ return nil, fmt.Errorf("project not found: %s", id)+ }+ project.Name = name+ project.Framework = framework+ if dropHealthyHealthchecks != nil {+ project.DropHealthyHealthchecks = *dropHealthyHealthchecks+ }+ if healthcheckPaths != nil {+ project.HealthcheckPaths = models.StringSlice(*healthcheckPaths)+ }+ if profileLabelAllowlist != nil {+ project.ProfileLabelAllowlist = models.StringSlice(*profileLabelAllowlist)+ }+ err = lit.UpdateNamed[models.Project](tx, project, "id = :id", lit.P{"id": id})+ if err != nil {+ return nil, err+ }+ return project, nil+ }++ func (p *projectRepository) Delete(tx *sql.Tx, id uuid.UUID) error {+ related := []string{+ "notification_rules",+ "notification_channels",+ "widget_groups",+ "source_maps",+ "metric_registry",++ "project_user_roles",+ }+ for _, table := range related {+ if err := lit.DeleteNamed(db.Driver, tx, "DELETE FROM "+table+" WHERE project_id = :project_id", lit.P{"project_id": id}); err != nil {+ return fmt.Errorf("deleting %s: %w", table, err)+ }+ }+ return lit.DeleteNamed(db.Driver, tx, "DELETE FROM projects WHERE id = :id", lit.P{"id": id})+ }++ func (p *projectRepository) FindBySourceMapToken(tx *sql.Tx, token string) (*models.Project, error) {+ return lit.SelectSingleNamed[models.Project](+ tx,+ "SELECT id, name, token, framework, organization_id, created_at, source_map_token, drop_healthy_healthchecks, healthcheck_paths, profile_label_allowlist FROM projects WHERE source_map_token = :smt",+ lit.P{"smt": token},+ )+ }++ func generateSecureToken() string {+ id := uuid.New()+ return strings.ReplaceAll(id.String(), "-", "")+ }++ func frameworkRequiresSymbolUpload(framework string) bool {+ switch framework {+ case "ios":+ return true+ default:+ return false+ }+ }++ var ProjectRepository = projectRepository{}diff --cc backend/app/repositories/transactional/sqlite/project_user_role.repository.goindex 00000000,00000000..05cec3b1new file mode 100644--- /dev/null+++ b/backend/app/repositories/transactional/sqlite/project_user_role.repository.go@@@ -1,0 -1,0 +1,69 @@@++//go:build !transactional_pg++++package sqlite++++import (++ "database/sql"++ "time"++++ "github.com/tracewayapp/traceway/backend/app/db"++ "github.com/tracewayapp/traceway/backend/app/models"++++ "github.com/google/uuid"++ "github.com/tracewayapp/lit/v2"++)++++type projectUserRoleRepository struct{}++++func (r *projectUserRoleRepository) FindByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) ([]*models.MemberProjectRole, error) {++ return lit.SelectNamed[models.MemberProjectRole](++ tx,++ `SELECT p.id as project_id, p.name, p.framework, pur.role++ FROM projects p++ LEFT JOIN project_user_roles pur ON pur.project_id = p.id AND pur.user_id = :user_id++ WHERE p.organization_id = :org_id++ ORDER BY p.created_at ASC`,++ lit.P{"org_id": organizationId, "user_id": userId},++ )++}++++func (r *projectUserRoleRepository) Upsert(tx *sql.Tx, projectId uuid.UUID, userId int, role string) error {++ query, args, err := lit.ParseNamedQuery(++ db.Driver,++ `INSERT INTO project_user_roles (project_id, user_id, role, created_at)++ VALUES (:project_id, :user_id, :role, :created_at)++ ON CONFLICT (project_id, user_id) DO UPDATE SET role = :role`,++ lit.P{++ "project_id": projectId,++ "user_id": userId,++ "role": role,++ "created_at": time.Now().UTC(),++ },++ )++ if err != nil {++ return err++ }++ return lit.UpdateNative(tx, query, args...)++}++++func (r *projectUserRoleRepository) Delete(tx *sql.Tx, projectId uuid.UUID, userId int) error {++ return lit.DeleteNamed(++ db.Driver,++ tx,++ "DELETE FROM project_user_roles WHERE project_id = :project_id AND user_id = :user_id",++ lit.P{"project_id": projectId, "user_id": userId},++ )++}++++func (r *projectUserRoleRepository) DeleteByOrganizationAndUser(tx *sql.Tx, organizationId int, userId int) error {++ return lit.DeleteNamed(++ db.Driver,++ tx,++ `DELETE FROM project_user_roles++ WHERE user_id = :user_id++ AND project_id IN (SELECT id FROM projects WHERE organization_id = :org_id)`,++ lit.P{"user_id": userId, "org_id": organizationId},++ )++}++++var ProjectUserRoleRepository = projectUserRoleRepository{}diff --cc backend/app/repositories/transactional/transactional_pg.goindex 00000000,75a0e0c5..d82cdafamode 000000,100644..100644--- a/backend/app/repositories/transactional/transactional_pg.go+++ b/backend/app/repositories/transactional/transactional_pg.go@@@ -1,0 -1,22 +1,23 @@@+ //go:build transactional_pg++ package transactional++ import pgrepo "github.com/tracewayapp/traceway/backend/app/repositories/transactional/pg"++ var (+ AuthorizationCodeRepository = pgrepo.AuthorizationCodeRepository+ DeviceAuthorizationRepository = pgrepo.DeviceAuthorizationRepository+ InvitationRepository = pgrepo.InvitationRepository+ MetricRegistryRepository = pgrepo.MetricRegistryRepository+ NotificationChannelRepository = pgrepo.NotificationChannelRepository+ NotificationRuleRepository = pgrepo.NotificationRuleRepository+ OAuthSessionRepository = pgrepo.OAuthSessionRepository+ OauthClientRepository = pgrepo.OauthClientRepository+ OrganizationRepository = pgrepo.OrganizationRepository+ PersonalAccessTokenRepository = pgrepo.PersonalAccessTokenRepository+ ProjectRepository = pgrepo.ProjectRepository++ ProjectUserRoleRepository = pgrepo.ProjectUserRoleRepository+ RefreshTokenRepository = pgrepo.RefreshTokenRepository+ UserRepository = pgrepo.UserRepository+ WidgetGroupRepository = pgrepo.WidgetGroupRepository+ )diff --cc backend/app/repositories/transactional/transactional_sqlite.goindex 00000000,a7cd9a77..b02117b7mode 000000,100644..100644--- a/backend/app/repositories/transactional/transactional_sqlite.go+++ b/backend/app/repositories/transactional/transactional_sqlite.go@@@ -1,0 -1,22 +1,23 @@@+ //go:build !transactional_pg++ package transactional++ import sqliterepo "github.com/tracewayapp/traceway/backend/app/repositories/transactional/sqlite"++ var (+ AuthorizationCodeRepository = sqliterepo.AuthorizationCodeRepository+ DeviceAuthorizationRepository = sqliterepo.DeviceAuthorizationRepository+ InvitationRepository = sqliterepo.InvitationRepository+ MetricRegistryRepository = sqliterepo.MetricRegistryRepository+ NotificationChannelRepository = sqliterepo.NotificationChannelRepository+ NotificationRuleRepository = sqliterepo.NotificationRuleRepository+ OAuthSessionRepository = sqliterepo.OAuthSessionRepository+ OauthClientRepository = sqliterepo.OauthClientRepository+ OrganizationRepository = sqliterepo.OrganizationRepository+ PersonalAccessTokenRepository = sqliterepo.PersonalAccessTokenRepository+ ProjectRepository = sqliterepo.ProjectRepository++ ProjectUserRoleRepository = sqliterepo.ProjectUserRoleRepository+ RefreshTokenRepository = sqliterepo.RefreshTokenRepository+ UserRepository = sqliterepo.UserRepository+ WidgetGroupRepository = sqliterepo.WidgetGroupRepository+ )diff --cc frontend/src/lib/components/add-project-modal.svelteindex d9e1e42b,305eb542..98a4b0cb--- a/frontend/src/lib/components/add-project-modal.svelte+++ b/frontend/src/lib/components/add-project-modal.svelte@@@ -4,10 -3,9 +4,11 @@@import { Button } from "$lib/components/ui/button";import { Input } from "$lib/components/ui/input";import { Label } from "$lib/components/ui/label";+ import * as Select from "$lib/components/ui/select";+ import { ErrorAlert } from "$lib/components/ui/error-alert";import { projectsState, getFrameworkLabel, type ProjectWithToken, type Framework } from '$lib/state/projects.svelte';+ import { authState } from '$lib/state/auth.svelte';- import { Copy, Check, ExternalLink } from 'lucide-svelte';+ import { Copy, Check, ExternalLink, Plus } from 'lucide-svelte';import FrameworkIcon from './framework-icon.svelte';import FrameworkCombobox from './framework-combobox.svelte';@@@ -160,28 -133,8 +157,30 @@@</div>{:else}<form onsubmit={handleSubmit} class="px-6 py-6 space-y-5">+ <ErrorAlert {error} />++ <div class="space-y-2">+ <Label>Organization</Label>+ {#if writableOrgs.length > 1}+ <Select.Root+ type="single"+ value={selectedOrgId !== null ? String(selectedOrgId) : undefined}+ onValueChange={(val) => { if (val) selectedOrgId = Number(val); }}+ >+ <Select.Trigger class="w-full" disabled={loading}>+ {selectedOrgName || 'Select organization'}+ </Select.Trigger>+ <Select.Content>+ {#each writableOrgs as org (org.id)}+ <Select.Item value={String(org.id)}>{org.name}</Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>+ {:else}+ <div class="text-sm font-medium">{selectedOrgName}</div>+ {/if}+ </div>+<div class="space-y-2"><Label for="project-name">Project Name</Label><Inputdiff --cc frontend/src/routes/settings/+page.svelteindex 71d2653e,be7abed1..53c58c7a--- a/frontend/src/routes/settings/+page.svelte+++ b/frontend/src/routes/settings/+page.svelte@@@ -70,28 -54,9 +70,28 @@@});</script>- <div class="space-y-6">+ <div class="space-y-4">- <div>+ <div class="flex items-center justify-between gap-4">- <h1 class="text-2xl font-semibold tracking-tight">Settings</h1>+ <h1 class="text-3xl font-semibold tracking-tight">Settings</h1>+ {#if manageableOrgs.length > 1}+ <div class="flex items-center gap-2">+ <span class="text-sm text-muted-foreground">Organization</span>+ <Select.Root+ type="single"+ value={currentOrganizationId !== null ? String(currentOrganizationId) : undefined}+ onValueChange={(val) => { if (val) selectedOrgId = Number(val); }}+ >+ <Select.Trigger class="w-[220px]">+ {currentOrganizationName || 'Select organization'}+ </Select.Trigger>+ <Select.Content>+ {#each manageableOrgs as org (org.id)}+ <Select.Item value={String(org.id)}>{org.name}</Select.Item>+ {/each}+ </Select.Content>+ </Select.Root>+ </div>+ {/if}</div>{#if loading}diff --cc frontend/src/routes/settings/users-tab.svelteindex ca8d69f4,a9e85a29..d674a0c8--- a/frontend/src/routes/settings/users-tab.svelte+++ b/frontend/src/routes/settings/users-tab.svelte@@@ -5,13 -5,10 +5,13 @@@import * as Select from "$lib/components/ui/select";import * as AlertDialog from "$lib/components/ui/alert-dialog";import { Badge } from "$lib/components/ui/badge";- import { UserPlus, Trash2, ChevronRight, ChevronDown } from "@lucide/svelte";- import { Plus, Trash2 } from "@lucide/svelte";++ import { Plus, Trash2, ChevronRight, ChevronDown } from "@lucide/svelte";import { toast } from 'svelte-sonner';- import { organizationState, type OrganizationMember, type Invitation } from '$lib/state/organization.svelte';+ import { organizationState, type OrganizationMember, type Invitation, type MemberProjectRole } from '$lib/state/organization.svelte';import { authState } from '$lib/state/auth.svelte';+ import { type Framework } from '$lib/state/projects.svelte';+ import FrameworkIcon from '$lib/components/framework-icon.svelte';+ import { LoadingCircle } from '$lib/components/ui/loading-circle';import InviteUserDialog from './invite-user-dialog.svelte';interface Props {