This commit is contained in:
phaichayon
2026-06-22 13:36:00 +07:00
parent 827fd13fa7
commit 42f403a7ed
23 changed files with 1425 additions and 68 deletions

View File

@@ -11,6 +11,8 @@ import {
users
} from '@/db/schema';
import { db } from '@/lib/db';
import { resolveCrmMembershipAccess } from '@/lib/auth/crm-access';
import { type SystemRole } from '@/lib/auth/rbac';
import { AuthError } from '@/lib/auth/session';
import { auditAction } from '@/features/foundation/audit-log/service';
import { getActiveOptionsByCategory } from '@/features/foundation/master-options/service';
@@ -611,7 +613,17 @@ async function assertActorCanHandleStep(organizationId: string, userId: string,
throw new AuthError('Organization membership required', 403);
}
if (membership.role === 'admin' || membership.businessRole === roleCode) {
const resolvedAccess = await resolveCrmMembershipAccess({
systemRole: userRow.systemRole as SystemRole,
organizationId,
membership
});
if (
membership.role === 'admin' ||
resolvedAccess.businessRoles.includes(roleCode) ||
resolvedAccess.businessRole === roleCode
) {
return;
}