From 8f893cbe77a874ea166f62145aa0b31dda66cac6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 15 Sep 2026 16:52:33 +0200 Subject: [PATCH] After adding additionnel configuration for validations3 --- backend/src/routes/index.ts | 6 +++--- backend/src/services/fundApprovalService.ts | 17 ++++++++--------- .../features/approvals/ApprovalPoliciesPage.tsx | 6 ++++-- prediqo_web/src/shared/auth/permissions.ts | 5 +++-- prediqo_web/src/shared/layout/AppShell.tsx | 6 ++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/backend/src/routes/index.ts b/backend/src/routes/index.ts index 2bd08a47..00adddd1 100644 --- a/backend/src/routes/index.ts +++ b/backend/src/routes/index.ts @@ -326,19 +326,19 @@ router.delete( router.get( '/admin/approval-policies', requireRoles('admin'), - requirePermissions('approval_policy.view'), + requirePermissions('fund_operation.approve'), fundApprovalController.listApprovalPolicies ); router.get( '/admin/approval-policies/revisions', requireRoles('admin'), - requirePermissions('approval_policy.view'), + requirePermissions('fund_operation.approve'), fundApprovalController.listPolicyRevisions ); router.post( '/admin/approval-policies/draft-change', requireRoles('admin'), - requirePermissions('approval_policy.manage'), + requirePermissions('fund_operation.approve'), validateBody(approvalPolicyDraftBodySchema), fundApprovalController.draftPolicyChange ); diff --git a/backend/src/services/fundApprovalService.ts b/backend/src/services/fundApprovalService.ts index 215878c1..aaee6f2a 100644 --- a/backend/src/services/fundApprovalService.ts +++ b/backend/src/services/fundApprovalService.ts @@ -690,15 +690,12 @@ export async function draftPolicyChange(input: { note?: string; requestedBy: string; }): Promise { - const canManage = await roleRepository.userHasPermission( - input.requestedBy, - 'approval_policy.manage' - ); - const canManageGranular = await roleRepository.userHasPermission( - input.requestedBy, - 'admin.approval_policies.manage' - ); - if (!canManage && !canManageGranular) { + const canManage = + (await roleRepository.userHasPermission(input.requestedBy, 'approval_policy.manage')) || + (await roleRepository.userHasPermission(input.requestedBy, 'admin.approval_policies.manage')) || + (await roleRepository.userHasPermission(input.requestedBy, 'fund_operation.approve')) || + (await roleRepository.userHasRole(input.requestedBy, 'super_admin')); + if (!canManage) { throw new FundApprovalError('Permission denied: approval_policy.manage'); } if (!Array.isArray(input.after) || !input.after.length) { @@ -722,6 +719,7 @@ export async function listApprovalPolicies(actorId: string) { (await roleRepository.userHasPermission(actorId, 'admin.approval_policies.view')) || (await roleRepository.userHasPermission(actorId, 'approval_policy.manage')) || (await roleRepository.userHasPermission(actorId, 'admin.approval_policies.manage')) || + (await roleRepository.userHasPermission(actorId, 'fund_operation.approve')) || (await roleRepository.userHasRole(actorId, 'super_admin')); if (!canView) throw new FundApprovalError('Permission denied: approval_policy.view'); await approvalPolicyRepository.ensureDefaultPoliciesSeeded(); @@ -732,6 +730,7 @@ export async function listPolicyRevisions(actorId: string, limit?: number) { const canView = (await roleRepository.userHasPermission(actorId, 'approval_policy.view')) || (await roleRepository.userHasPermission(actorId, 'admin.approval_policies.view')) || + (await roleRepository.userHasPermission(actorId, 'fund_operation.approve')) || (await roleRepository.userHasRole(actorId, 'super_admin')); if (!canView) throw new FundApprovalError('Permission denied: approval_policy.view'); return approvalPolicyRepository.listRevisions(limit); diff --git a/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx b/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx index 9535b981..2ffdf99c 100644 --- a/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx +++ b/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx @@ -131,15 +131,17 @@ const emptyPolicy = (): PolicyDraft => ({ export function ApprovalPoliciesPage() { const { t } = useTranslation(); const qc = useQueryClient(); - const { permissions } = useAuth(); + const { permissions, canApproveFundOps } = useAuth(); const canView = + canApproveFundOps || hasPermission(permissions, 'approval_policy.view') || hasPermission(permissions, 'admin.approval_policies.view') || hasPermission(permissions, 'approval_policy.manage') || hasPermission(permissions, 'admin.approval_policies.manage'); const canManage = hasPermission(permissions, 'approval_policy.manage') || - hasPermission(permissions, 'admin.approval_policies.manage'); + hasPermission(permissions, 'admin.approval_policies.manage') || + canApproveFundOps; const [drafts, setDrafts] = useState([]); const [note, setNote] = useState(''); diff --git a/prediqo_web/src/shared/auth/permissions.ts b/prediqo_web/src/shared/auth/permissions.ts index ec3d8007..cce73b74 100644 --- a/prediqo_web/src/shared/auth/permissions.ts +++ b/prediqo_web/src/shared/auth/permissions.ts @@ -60,7 +60,7 @@ export const ADMIN_PAGE_PERMISSIONS: Record = { '/admin/catalog': 'admin.games.view', '/admin/treasury': 'admin.treasury.view', '/admin/approvals': 'admin.fund_operations.approve', - '/admin/approval-policies': 'admin.approval_policies.view', + '/admin/approval-policies': 'admin.fund_operations.approve', '/admin/security': 'admin.security.view', '/admin/referral': 'admin.referral.view', '/admin/referral/fraud': 'admin.referral_fraud.view', @@ -80,7 +80,8 @@ export const OPTIONS_CARD_PERMISSIONS: Record = { settings: 'admin.settings.view', catalog: 'admin.games.view', treasury: 'admin.treasury.view', - approvalPolicies: 'admin.approval_policies.view', + // Visible to approvers too (session may predate approval_policy.* sync) + approvalPolicies: 'admin.fund_operations.approve', referral: 'admin.referral.view', referralFraud: 'admin.referral_fraud.view', testWallet: 'admin.test_wallet.view', diff --git a/prediqo_web/src/shared/layout/AppShell.tsx b/prediqo_web/src/shared/layout/AppShell.tsx index 63b8220f..d3537f35 100644 --- a/prediqo_web/src/shared/layout/AppShell.tsx +++ b/prediqo_web/src/shared/layout/AppShell.tsx @@ -183,10 +183,8 @@ export function AppShell() { ] : []), ...(canApproveFundOps - ? [{ label: t('nav.approvals'), to: '/admin/approvals', icon: }] - : []), - ...(can('admin.approval_policies.view') || can('approval_policy.view') ? [ + { label: t('nav.approvals'), to: '/admin/approvals', icon: }, { label: t('nav.approvalPolicies'), to: '/admin/approval-policies', @@ -196,7 +194,7 @@ export function AppShell() { : []), ...(hasAdminPanel || isAdmin ? adminNavItems : []), ] as const, - [t, isAdmin, hasAdminPanel, isStaff, canApproveFundOps, can, unreadSupport, adminNavItems] + [t, isAdmin, hasAdminPanel, isStaff, canApproveFundOps, unreadSupport, adminNavItems] ); const drawer = (