Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -286,7 +287,7 @@ const App = () => (
options={{ menuGroup: 'settings' }}
icon={CalculateIcon}
/>
{isAdmin(permissions) && (
{isAttendanceCleanupRules(permissions) && (
<Resource
name="attendance_cleanup_rule"
{...attendanceCleanupRule}
Expand Down
7 changes: 6 additions & 1 deletion client/src/utils/appPermissions.js
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -17,6 +17,7 @@ export const appPermissions = {
seminarAttendanceYemot: 'seminarAttendanceYemot',
lessonSchedule: 'lessonSchedule',
perDateLessonCount: 'perDateLessonCount',
attendanceCleanupRules: 'attendanceCleanupRules',
};

export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload);
Expand Down Expand Up @@ -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();
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions server/src/entity-modules/attendance-cleanup-rule.config.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -34,6 +35,7 @@ class AttendanceCleanupRuleService<T extends Entity | AttendanceCleanupRule> ext
function getConfig(): BaseEntityModuleOptions {
return {
entity: AttendanceCleanupRule,
crudAuth: CrudAuthWithPermissionsFilter(permissions => permissions?.attendanceCleanupRules),
query: {
join: {
lesson: { eager: false },
Expand Down
Loading