Merge remote-tracking branch 'origin/feat/endpoints-beschermen-met-authenticatie-#105' into feat/endpoints-beschermen-met-authenticatie-#105

backend/src/controllers/auth.ts

@@ -5,7 +5,7 @@ import { envVars, getEnvVar } from '../util/envVars.js';
 import { createOrUpdateStudent } from '../services/students.js';
 import { Request, Response } from 'express';
 import { createOrUpdateTeacher } from '../services/teachers.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 interface FrontendIdpConfig {
     authority: string;

backend/src/middleware/auth/checks/assignment-auth-checks.ts

@@ -2,7 +2,7 @@ import { authorize } from './auth-checks.js';
 import { fetchClass } from '../../../services/classes.js';
 import { fetchAllGroups } from '../../../services/groups.js';
 import { mapToUsername } from '../../../interfaces/user.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 /**
  * Expects the path to contain the path parameters 'classId' and 'id' (meaning the ID of the assignment).

backend/src/middleware/auth/checks/auth-checks.ts

@@ -5,7 +5,7 @@ import { RequestHandler } from 'express';
 import { UnauthorizedException } from '../../../exceptions/unauthorized-exception.js';
 import { ForbiddenException } from '../../../exceptions/forbidden-exception.js';
 import { envVars, getEnvVar } from '../../../util/envVars.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 /**
  * Middleware which rejects unauthenticated users (with HTTP 401) and authenticated users which do not fulfill

backend/src/middleware/auth/checks/class-auth-checks.ts

@@ -4,7 +4,7 @@ import { AuthenticatedRequest } from '../authenticated-request.js';
 import { fetchClass } from '../../../services/classes.js';
 import { mapToUsername } from '../../../interfaces/user.js';
 import { getAllInvitations } from '../../../services/teacher-invitations.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 async function teaches(teacherUsername: string, classId: string): Promise<boolean> {
     const clazz = await fetchClass(classId);

backend/src/middleware/auth/checks/group-auth-checker.ts

@@ -2,7 +2,7 @@ import { authorize } from './auth-checks.js';
 import { fetchClass } from '../../../services/classes.js';
 import { fetchGroup } from '../../../services/groups.js';
 import { mapToUsername } from '../../../interfaces/user.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 /**
  * Expects the path to contain the path parameters 'classid', 'assignmentid' and 'groupid'.

backend/src/middleware/auth/checks/learning-content-auth-checks.ts

@@ -1,7 +1,7 @@
 import { authorize } from './auth-checks';
 import { AuthenticationInfo } from '../authentication-info';
 import { AuthenticatedRequest } from '../authenticated-request';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 /**
  * Only allows requests whose learning path personalization query parameters ('forGroup' / 'assignmentNo' / 'classId')

backend/src/middleware/auth/checks/question-checks.ts

@@ -7,7 +7,7 @@ import { fetchQuestion } from '../../../services/questions.js';
 import { FALLBACK_SEQ_NUM } from '../../../config.js';
 import { fetchAnswer } from '../../../services/answers.js';
 import { mapToUsername } from '../../../interfaces/user.js';
-import {AccountType} from "@dwengo-1/common/util/account-types";
+import { AccountType } from '@dwengo-1/common/util/account-types';
 
 export const onlyAllowAuthor = authorize(
     (auth: AuthenticationInfo, req: AuthenticatedRequest) => (req.body as { author: string }).author === auth.username

backend/src/middleware/auth/checks/submission-checks.ts

@@ -6,7 +6,7 @@ import { AuthenticationInfo } from '../authentication-info.js';
 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 { AccountType } from '@dwengo-1/common/util/account-types';
 
 export const onlyAllowSubmitter = authorize(
     (auth: AuthenticationInfo, req: AuthenticatedRequest) => (req.body as { submitter: string }).submitter === auth.username

backend/src/services/teachers.ts

@@ -100,13 +100,9 @@ export async function getStudentsByTeacher(username: string, full: boolean): Pro
 
     const classIds: string[] = classes.map((cls) => cls.id);
 
-    const students: StudentDTO[] = (await Promise.all(
+    const students: StudentDTO[] = (await Promise.all(classIds.map(async (classId) => await getClassStudentsDTO(classId))))
-        classIds.map(async (classId) => await getClassStudentsDTO(classId))
-    ))
         .flat()
-        .filter((student, index, self) =>
+        .filter((student, index, self) => self.findIndex((s) => s.username === student.username) === index);
-            self.findIndex((s) => s.username === student.username) === index
-        );
 
     if (full) {
         return students;

common/src/util/account-types.ts

@@ -1,4 +1,4 @@
 export enum AccountType {
     Student = 'student',
-    Teacher = 'teacher'
+    Teacher = 'teacher',
 }

frontend/src/components/SingleQuestion.vue

@@ -6,7 +6,7 @@
     import type { AnswersResponse } from "@/controllers/answers";
     import type { AnswerData, AnswerDTO } from "@dwengo-1/common/interfaces/answer";
     import authService from "@/services/auth/auth-service";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const props = defineProps<{
         question: QuestionDTO;

frontend/src/views/LoginPage.vue

@@ -3,7 +3,7 @@
     import dwengoLogo from "../../../assets/img/dwengo-groen-zwart.svg";
     import auth from "@/services/auth/auth-service.ts";
     import { watch } from "vue";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const router = useRouter();
 

frontend/src/views/assignments/CreateAssignment.vue

@@ -14,7 +14,7 @@
     import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
     import { useCreateAssignmentMutation } from "@/queries/assignments.ts";
     import { useRoute } from "vue-router";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const route = useRoute();
     const router = useRouter();

frontend/src/views/assignments/SingleAssignment.vue

@@ -8,7 +8,7 @@
     import { useGetLearningPathQuery } from "@/queries/learning-paths.ts";
     import type { LearningPath } from "@/data-objects/learning-paths/learning-path.ts";
     import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const role = auth.authState.activeRole;
     const isTeacher = computed(() => role === AccountType.Teacher);

frontend/src/views/assignments/UserAssignments.vue

@@ -9,7 +9,7 @@
     import type { ClassDTO } from "@dwengo-1/common/interfaces/class";
     import { asyncComputed } from "@vueuse/core";
     import { useDeleteAssignmentMutation } from "@/queries/assignments.ts";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
     import "../../assets/common.css";
 
     const { t, locale } = useI18n();

frontend/src/views/classes/UserClasses.vue

@@ -2,7 +2,7 @@
     import authState from "@/services/auth/auth-service.ts";
     import TeacherClasses from "./TeacherClasses.vue";
     import StudentClasses from "./StudentClasses.vue";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     // Determine if role is student or teacher to render correct view
     const role: string = authState.authState.activeRole!;

frontend/src/views/learning-paths/LearningPathPage.vue

@@ -22,7 +22,7 @@
     import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
     import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
     import QuestionNotification from "@/components/QuestionNotification.vue";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const router = useRouter();
     const route = useRoute();
@@ -237,7 +237,9 @@
                     </template>
                 </v-list-item>
                 <v-list-itemF
-                    v-if="query.classId && query.assignmentNo && authService.authState.activeRole === AccountType.Teacher"
+                    v-if="
+                        query.classId && query.assignmentNo && authService.authState.activeRole === AccountType.Teacher
+                    "
                 >
                     <template v-slot:default>
                         <learning-path-group-selector
@@ -260,7 +262,9 @@
                                 :title="node.title"
                                 :active="node.key === props.learningObjectHruid"
                                 :key="node.key"
-                                v-if="!node.teacherExclusive || authService.authState.activeRole === AccountType.Teacher"
+                                v-if="
+                                    !node.teacherExclusive || authService.authState.activeRole === AccountType.Teacher
+                                "
                             >
                                 <template v-slot:prepend>
                                     <v-icon

frontend/src/views/learning-paths/learning-object/LearningObjectView.vue

@@ -8,7 +8,7 @@
     import type { SubmissionData } from "@/views/learning-paths/learning-object/submission-data";
     import LearningObjectContentView from "@/views/learning-paths/learning-object/content/LearningObjectContentView.vue";
     import LearningObjectSubmissionsView from "@/views/learning-paths/learning-object/submissions/LearningObjectSubmissionsView.vue";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const _isStudent = computed(() => authService.authState.activeRole === AccountType.Student);
 

frontend/src/views/learning-paths/learning-object/submissions/SubmitButton.vue

@@ -11,7 +11,7 @@
     import type { StudentDTO } from "@dwengo-1/common/interfaces/student";
     import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
     import { useI18n } from "vue-i18n";
-    import {AccountType} from "@dwengo-1/common/util/account-types";
+    import { AccountType } from "@dwengo-1/common/util/account-types";
 
     const { t } = useI18n();