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) || useIsAdmin(); 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 },