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
53 changes: 52 additions & 1 deletion client/src/components/TeacherView/TeacherAccess.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useEffect } from 'react';
import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton, useResetStore } from 'react-admin';
import { useObjectStore } from 'src/utils/storeUtil';
import Button from '@mui/material/Button';
Expand All @@ -10,18 +11,67 @@ import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
import LogoutIcon from '@mui/icons-material/Logout';
import Paper from '@mui/material/Paper';

// Teacher login lives only in this tab (sessionStorage) and expires after idle time,
// so the next teacher on a shared computer must enter her ID again.
export const TEACHER_IDLE_TIMEOUT_MS = 15 * 60 * 1000;
const LAST_ACTIVE_KEY = 'teacherLastActive';
const ACTIVITY_EVENTS = ['mousedown', 'keydown', 'touchstart', 'scroll'];

const getLastActive = () => {
try {
return Number(sessionStorage.getItem(LAST_ACTIVE_KEY)) || 0;
} catch {
return 0;
}
};
const touchLastActive = () => {
try {
sessionStorage.setItem(LAST_ACTIVE_KEY, String(Date.now()));
} catch {}
};
const clearLastActive = () => {
try {
sessionStorage.removeItem(LAST_ACTIVE_KEY);
} catch {}
};
const isSessionActive = () => Date.now() - getLastActive() < TEACHER_IDLE_TIMEOUT_MS;

export const TeacherGuard = ({ children }) => {
const dataProvider = useDataProvider();
const notify = useNotify();
const reset = useResetStore();
const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher');
const sessionActive = !!teacher && isSessionActive();

const handleLogout = () => {
clearLastActive();
clear();
reset();
};

if (teacher) {
useEffect(() => {
if (teacher && !sessionActive) {
handleLogout();
}
}, [teacher, sessionActive]);

useEffect(() => {
if (!sessionActive) {
return;
}
ACTIVITY_EVENTS.forEach((event) => window.addEventListener(event, touchLastActive, { passive: true }));
const interval = setInterval(() => {
if (!isSessionActive()) {
handleLogout();
}
}, 30 * 1000);
return () => {
ACTIVITY_EVENTS.forEach((event) => window.removeEventListener(event, touchLastActive));
clearInterval(interval);
};
}, [sessionActive]);

if (sessionActive) {
return (
<Box display="flex" flexDirection="column" width="100%">
<Paper
Expand Down Expand Up @@ -55,6 +105,7 @@ export const TeacherGuard = ({ children }) => {
const teacher = result.data[0] || null;

if (teacher) {
touchLastActive();
setTeacher(teacher);
} else {
notify('לא נמצאה מורה עם ת.ז. זו. יש לבדוק שהמספר נכון (כולל אפס בתחילתו), ואם הבעיה נמשכת לפנות להנהלת המוסד.', { type: 'warning' });
Expand Down
65 changes: 65 additions & 0 deletions client/src/components/TeacherView/TeacherAccess.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { render, screen, act } from '@testing-library/react';
import { AdminContext, memoryStore } from 'react-admin';
import { TeacherGuard, TEACHER_IDLE_TIMEOUT_MS } from './TeacherAccess';

const teacher = { id: 7, name: 'כהן', tz: '123456789' };

const renderGuard = (store) =>
render(
<AdminContext store={store} dataProvider={{ getList: jest.fn() }}>
<TeacherGuard>
<div>תוכן מורה</div>
</TeacherGuard>
</AdminContext>,
);

beforeEach(() => {
sessionStorage.clear();
jest.useFakeTimers();
});

afterEach(() => {
jest.useRealTimers();
});

test('shows login when teacher stored but tab session is new (tab was closed)', () => {
const store = memoryStore({ teacher });
renderGuard(store);
expect(screen.queryByText('תוכן מורה')).toBeNull();
expect(screen.getByText('כניסת מורה')).toBeTruthy();
expect(store.getItem('teacher')).toBeFalsy();
});

test('shows content when teacher stored and tab session is active', () => {
sessionStorage.setItem('teacherLastActive', String(Date.now()));
renderGuard(memoryStore({ teacher }));
expect(screen.getByText('תוכן מורה')).toBeTruthy();
});

test('logs out after idle timeout', () => {
sessionStorage.setItem('teacherLastActive', String(Date.now()));
const store = memoryStore({ teacher });
renderGuard(store);
expect(screen.getByText('תוכן מורה')).toBeTruthy();

act(() => {
jest.advanceTimersByTime(TEACHER_IDLE_TIMEOUT_MS + 60 * 1000);
});

expect(screen.queryByText('תוכן מורה')).toBeNull();
expect(store.getItem('teacher')).toBeFalsy();
});

test('activity keeps teacher logged in', () => {
sessionStorage.setItem('teacherLastActive', String(Date.now()));
renderGuard(memoryStore({ teacher }));

for (let i = 0; i < 4; i++) {
act(() => {
jest.advanceTimersByTime(TEACHER_IDLE_TIMEOUT_MS / 2);
window.dispatchEvent(new Event('keydown'));
});
}

expect(screen.getByText('תוכן מורה')).toBeTruthy();
});
1 change: 1 addition & 0 deletions client/src/roadmapFeatures.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading