diff --git a/backend/internal/models/tenant.go b/backend/internal/models/tenant.go index adc720d..5fcd1a1 100644 --- a/backend/internal/models/tenant.go +++ b/backend/internal/models/tenant.go @@ -20,6 +20,7 @@ type UserTenant struct { UserID uuid.UUID `db:"user_id" json:"user_id"` TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"` Role string `db:"role" json:"role"` + Email string `db:"email" json:"email"` CreatedAt time.Time `db:"created_at" json:"created_at"` } diff --git a/backend/internal/services/tenant_service.go b/backend/internal/services/tenant_service.go index e3eea33..87ac077 100644 --- a/backend/internal/services/tenant_service.go +++ b/backend/internal/services/tenant_service.go @@ -139,7 +139,11 @@ func (s *TenantService) FirstTenantForUser(ctx context.Context, userID uuid.UUID func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) { var members []models.UserTenant err := s.db.SelectContext(ctx, &members, - `SELECT user_id, tenant_id, role, created_at FROM user_tenants WHERE tenant_id = $1 ORDER BY created_at`, + `SELECT ut.user_id, ut.tenant_id, ut.role, ut.created_at, COALESCE(au.email, '') as email + FROM user_tenants ut + LEFT JOIN auth.users au ON au.id = ut.user_id + WHERE ut.tenant_id = $1 + ORDER BY ut.created_at`, tenantID, ) if err != nil { diff --git a/frontend/src/components/settings/TeamSettings.tsx b/frontend/src/components/settings/TeamSettings.tsx index d5fc5ca..e69435c 100644 --- a/frontend/src/components/settings/TeamSettings.tsx +++ b/frontend/src/components/settings/TeamSettings.tsx @@ -164,7 +164,7 @@ export function TeamSettings() {

- {member.user_id.slice(0, 8)}... + {member.email || member.user_id.slice(0, 8) + "..."}

{roleInfo.label}