From b123814a61b2bc525a988ba4fb6d2bca77594905 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 21 Aug 2026 05:54:51 +0000 Subject: [PATCH 1/2] Add dedicated attendanceCleanupRules permission MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gate the attendance_cleanup_rule resource behind a dedicated permission instead of admin-only, on both client and server: - client/src/utils/appPermissions.js: add attendanceCleanupRules key + isAttendanceCleanupRules/useIsAttendanceCleanupRules helpers - client/src/App.jsx: gate the Resource on isAttendanceCleanupRules instead of isAdmin - server: set crudAuth: CrudAuthWithPermissionsFilter(permissions => permissions?.attendanceCleanupRules) on the entity config, with admin still allowed through as before - add crudAuth test coverage No extra wiring needed to make the permission assignable — the shared User edit screen (nra-client's user.jsx) already generates a checkbox for every key in appPermissions automatically. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_011dEYULADLgGNfZ4nv6gz8s --- client/src/App.jsx | 3 ++- client/src/utils/appPermissions.js | 5 ++++ .../attendance-cleanup-rule.config.spec.ts | 23 +++++++++++++++++++ .../attendance-cleanup-rule.config.ts | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 55c94553..46fbd8cc 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -65,6 +65,7 @@ import { isLessonSchedule, isStudentView, isSeminarAttendanceYemot, + isAttendanceCleanupRules, } from 'src/utils/appPermissions'; import ScannerUpload from '@shared/components/views/ScannerUpload'; import InLessonReport from 'src/reports/InLessonReport'; @@ -286,7 +287,7 @@ const App = () => ( options={{ menuGroup: 'settings' }} icon={CalculateIcon} /> - {isAdmin(permissions) && ( + {isAttendanceCleanupRules(permissions) && ( hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -76,3 +77,7 @@ export const useIsLessonSchedule = () => useHasPermission(appPermissions.lessonS export const isPerDateLessonCount = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.perDateLessonCount); export const useIsPerDateLessonCount = () => useHasPermission(appPermissions.perDateLessonCount); + +export const isAttendanceCleanupRules = (permissions) => + isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.attendanceCleanupRules); +export const useIsAttendanceCleanupRules = () => useHasPermission(appPermissions.attendanceCleanupRules); diff --git a/server/src/entity-modules/__tests__/attendance-cleanup-rule.config.spec.ts b/server/src/entity-modules/__tests__/attendance-cleanup-rule.config.spec.ts index 96b8e441..d3437f32 100644 --- a/server/src/entity-modules/__tests__/attendance-cleanup-rule.config.spec.ts +++ b/server/src/entity-modules/__tests__/attendance-cleanup-rule.config.spec.ts @@ -1,4 +1,5 @@ import { CrudRequest } from '@dataui/crud'; +import { ADMIN_FILTER, NO_DATA_FILTER } from '@shared/auth/crud-auth.filter'; import { AttendanceCleanupRule } from 'src/db/entities/AttendanceCleanupRule.entity'; import attendanceCleanupRuleConfig from '../attendance-cleanup-rule.config'; @@ -14,6 +15,28 @@ describe('AttendanceCleanupRuleConfig', () => { expect(attendanceCleanupRuleConfig.service).toBeDefined(); }); + describe('crudAuth', () => { + it('grants access to a user with the attendanceCleanupRules permission', () => { + const user = { permissions: { attendanceCleanupRules: true } }; + expect(attendanceCleanupRuleConfig.crudAuth.filter(user)).toEqual(ADMIN_FILTER); + }); + + it('grants access to an admin regardless of the dedicated permission', () => { + const user = { permissions: { admin: true } }; + expect(attendanceCleanupRuleConfig.crudAuth.filter(user)).toEqual(ADMIN_FILTER); + }); + + it('denies a user lacking the permission (no rows, not a 403)', () => { + const user = { permissions: {} }; + expect(attendanceCleanupRuleConfig.crudAuth.filter(user)).toEqual(NO_DATA_FILTER); + }); + + it('denies a user with no permissions object at all', () => { + const user = {}; + expect(attendanceCleanupRuleConfig.crudAuth.filter(user)).toEqual(NO_DATA_FILTER); + }); + }); + describe('doAction: runNow', () => { function makeService() { const ServiceClass = attendanceCleanupRuleConfig.service as any; diff --git a/server/src/entity-modules/attendance-cleanup-rule.config.ts b/server/src/entity-modules/attendance-cleanup-rule.config.ts index 045c9f90..858d4291 100644 --- a/server/src/entity-modules/attendance-cleanup-rule.config.ts +++ b/server/src/entity-modules/attendance-cleanup-rule.config.ts @@ -1,6 +1,7 @@ import { CrudRequest } from '@dataui/crud'; import { Repository } from 'typeorm'; import { getUserIdFromUser } from '@shared/auth/auth.util'; +import { CrudAuthWithPermissionsFilter } from '@shared/auth/crud-auth.filter'; import { BaseEntityService } from '@shared/base-entity/base-entity.service'; import { BaseEntityModuleOptions, Entity, InjectEntityRepository } from '@shared/base-entity/interface'; import { MailSendService } from '@shared/utils/mail/mail-send.service'; @@ -34,6 +35,7 @@ class AttendanceCleanupRuleService ext function getConfig(): BaseEntityModuleOptions { return { entity: AttendanceCleanupRule, + crudAuth: CrudAuthWithPermissionsFilter(permissions => permissions?.attendanceCleanupRules), query: { join: { lesson: { eager: false }, From 6c7f986c0fc2626d1ac12a49dcd110fbf7e2b2de Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 21 Aug 2026 07:14:47 +0000 Subject: [PATCH 2/2] Align useIsAttendanceCleanupRules with isAttendanceCleanupRules admin override Addresses Copilot review comment on PR #146: the hook only checked the dedicated permission key, while the plain isAttendanceCleanupRules function also grants admins. Match the existing shared-util pattern (useIsShowUsersData, useIsEditPagesData, ...): useHasPermission(key) || useIsAdmin(). Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_011dEYULADLgGNfZ4nv6gz8s --- client/src/utils/appPermissions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 7a29c7d1..bfd5fd69 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -1,4 +1,4 @@ -import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; +import { useHasPermission, hasPermissionLogic, isAdmin, useIsAdmin } from '@shared/utils/permissionsUtil'; export const appPermissions = { scannerUpload: 'scannerUpload', @@ -80,4 +80,4 @@ export const useIsPerDateLessonCount = () => useHasPermission(appPermissions.per export const isAttendanceCleanupRules = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.attendanceCleanupRules); -export const useIsAttendanceCleanupRules = () => useHasPermission(appPermissions.attendanceCleanupRules); +export const useIsAttendanceCleanupRules = () => useHasPermission(appPermissions.attendanceCleanupRules) || useIsAdmin();