diff --git a/backend/src/middleware/auth/checks/submission-checks.ts b/backend/src/middleware/auth/checks/submission-checks.ts index 893371c2..7cd75c8d 100644 --- a/backend/src/middleware/auth/checks/submission-checks.ts +++ b/backend/src/middleware/auth/checks/submission-checks.ts @@ -7,6 +7,9 @@ import { authorize } from './auth-checks.js'; import { FALLBACK_LANG } from '../../../config.js'; import { mapToUsername } from '../../../interfaces/user.js'; import { AccountType } from '@dwengo-1/common/util/account-types'; +import { fetchClass } from '../../../services/classes.js'; +import { fetchGroup } from '../../../services/groups.js'; +import { requireFields } from '../../../controllers/error-helper.js'; export const onlyAllowSubmitter = authorize( (auth: AuthenticationInfo, req: AuthenticatedRequest) => (req.body as { submitter: string }).submitter === auth.username @@ -26,3 +29,17 @@ export const onlyAllowIfHasAccessToSubmission = authorize(async (auth: Authentic return submission.onBehalfOf.members.map(mapToUsername).includes(auth.username); }); + +export const onlyAllowIfHasAccessToSubmissionFromParams = authorize(async (auth: AuthenticationInfo, req: AuthenticatedRequest) => { + const { classId, assignmentId, groupId } = req.query; + + requireFields({ classId, assignmentId, groupId }); + + if (auth.accountType === AccountType.Teacher) { + const cls = await fetchClass(classId as string); + return cls.teachers.map(mapToUsername).includes(auth.username); + } + + const group = await fetchGroup(classId as string, Number(assignmentId as string), Number(groupId as string)); + return group.members.map(mapToUsername).includes(auth.username); +}); diff --git a/backend/src/routes/submissions.ts b/backend/src/routes/submissions.ts index 88309ce8..58176b40 100644 --- a/backend/src/routes/submissions.ts +++ b/backend/src/routes/submissions.ts @@ -1,10 +1,14 @@ import express from 'express'; import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler, getSubmissionsHandler } from '../controllers/submissions.js'; -import { onlyAllowIfHasAccessToSubmission, onlyAllowSubmitter } from '../middleware/auth/checks/submission-checks.js'; -import { adminOnly, studentsOnly } from '../middleware/auth/checks/auth-checks.js'; +import { + onlyAllowIfHasAccessToSubmission, + onlyAllowIfHasAccessToSubmissionFromParams, + onlyAllowSubmitter, +} from '../middleware/auth/checks/submission-checks.js'; +import { studentsOnly } from '../middleware/auth/checks/auth-checks.js'; const router = express.Router({ mergeParams: true }); -router.get('/', adminOnly, getSubmissionsHandler); +router.get('/', onlyAllowIfHasAccessToSubmissionFromParams, getSubmissionsHandler); router.post('/', studentsOnly, onlyAllowSubmitter, createSubmissionHandler); diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue index 88b757b7..7879af45 100644 --- a/frontend/src/components/MenuBar.vue +++ b/frontend/src/components/MenuBar.vue @@ -149,7 +149,8 @@