fix(rbac-ui): identify org owner row by tenant_id, not user_id
Plan 3 (#1303) lifted Org membership from per-user to per-tenant, and 40fdb978 pinned the org's owner tenant in DB as organizations.owner_tenant_id. The OrganizationSettingsModal members list, however, still decided "which row is the owner" by comparing member.user_id against orgInfo.owner_id. After Plan 3 the members list is keyed on tenant_id, so the user-id check is structurally wrong: the representative user of the owner tenant happens to be the owner today, but if that user is moved to another tenant — or a different user of the owner tenant becomes the representative — the modal would either lose the "(owner)" tag, or re-tag a non-owner row, and would offer the role-select / remove-button affordances on what is in fact the owner tenant row. This change: - Adds OwnerTenantID to OrganizationResponse and populates it in toOrgResponse from the persisted column. IsOwner now compares the caller's current tenant against owner_tenant_id (with a user-id fallback for legacy rows where owner_tenant_id == 0). - Adds owner_tenant_id to the frontend Organization type and a small isOwnerMember(member) helper in OrganizationSettingsModal, which tenant-matches by default and falls back to user-id only on pre-000046 rows. The role <select>, role tag suffix, and the delete button on member rows now all use the helper. The "is-me" CSS class and the me-tag in the member name still match on user_id — that one really is a per-user marker ("this row's user is me, the signed-in user").
This commit is contained in:
@@ -1662,13 +1662,25 @@ func (h *OrganizationHandler) SetSharedAgentDisabledByMe(c *gin.Context) {
|
||||
// toOrgResponse converts an organization to response format
|
||||
func (h *OrganizationHandler) toOrgResponse(ctx context.Context, org *types.Organization, currentUserID string) types.OrganizationResponse {
|
||||
currentTenantID := types.MustTenantIDFromContext(ctx)
|
||||
// Post-Plan-3 the canonical "is the caller the owner side?" check
|
||||
// is tenant-based: org.OwnerTenantID is the pinned column; legacy
|
||||
// rows with OwnerTenantID == 0 (pre-000046, unlikely in prod)
|
||||
// fall back to the user-id check so we don't show the wrong tenant
|
||||
// as "owner" in those edge cases.
|
||||
isOwner := false
|
||||
if org.OwnerTenantID != 0 {
|
||||
isOwner = org.OwnerTenantID == currentTenantID
|
||||
} else {
|
||||
isOwner = org.OwnerID == currentUserID
|
||||
}
|
||||
resp := types.OrganizationResponse{
|
||||
ID: org.ID,
|
||||
Name: org.Name,
|
||||
Description: org.Description,
|
||||
Avatar: org.Avatar,
|
||||
OwnerID: org.OwnerID,
|
||||
IsOwner: org.OwnerID == currentUserID,
|
||||
OwnerTenantID: org.OwnerTenantID,
|
||||
IsOwner: isOwner,
|
||||
RequireApproval: org.RequireApproval,
|
||||
Searchable: org.Searchable,
|
||||
MemberLimit: org.MemberLimit,
|
||||
|
||||
Reference in New Issue
Block a user