tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix: Fouten in implementatie van hello-mechanisme opgelost.

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-19 16:47:47 +02:00
parent 59569445c3
commit 57ff2daf6c
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/controllers/auth.ts
View file

@ -1,4 +1,5 @@
import { UnauthorizedException } from '../exceptions/unauthorized-exception.js';
import { getLogger } from '../logging/initalize.js';
import { AuthenticatedRequest } from '../middleware/auth/authenticated-request.js';
import { createOrUpdateStudent } from '../services/students.js';
import { createOrUpdateTeacher } from '../services/teachers.js';
@ -20,6 +21,8 @@ interface FrontendAuthConfig {
const SCOPE = 'openid profile email';
const RESPONSE_TYPE = 'code';
const logger = getLogger();
export function getFrontendAuthConfig(): FrontendAuthConfig {
return {
student: {
@ -37,7 +40,7 @@ export function getFrontendAuthConfig(): FrontendAuthConfig {
};
}
export async function postHelloHandler(req: AuthenticatedRequest, _res: Response): Promise<void> {
export async function postHelloHandler(req: AuthenticatedRequest, res: Response): Promise<void> {
const auth = req.auth;
if (!auth) {
throw new UnauthorizedException("Cannot say hello when not authenticated.");
@ -49,8 +52,11 @@ export async function postHelloHandler(req: AuthenticatedRequest, _res: Response
lastName: auth.lastName ?? ''
};
if (auth.accountType === "student") {
await createOrUpdateStudent({ ...userData }, { preventOverwrite: false });
await createOrUpdateStudent(userData);
logger.debug(`Synchronized student ${userData.username} with IDP`);
} else {
await createOrUpdateTeacher({ ...userData }, { preventOverwrite: false });
await createOrUpdateTeacher(userData);
logger.debug(`Synchronized teacher ${userData.username} with IDP`);
}
res.status(200).send({ message: "Welcome!" });
}

2
backend/src/middleware/error-handling/error-handler.ts
View file

@ -9,7 +9,7 @@ export function errorHandler(err: unknown, _req: Request, res: Response, _: Next
logger.warn(`An error occurred while handling a request: ${err} (-> HTTP ${err.status})`);
res.status(err.status).json(err);
} else {
logger.error(`Unexpected error occurred while handing a request: ${JSON.stringify(err)}`);
logger.error(`Unexpected error occurred while handing a request: ${err}`);
res.status(500).json(err);
}
}

14
backend/src/services/students.ts
View file

@ -53,16 +53,22 @@ export async function getStudent(username: string): Promise<StudentDTO> {
return mapToStudentDTO(user);
}
export async function createOrUpdateStudent(userData: StudentDTO, options?: { preventOverwrite: boolean}): Promise<StudentDTO> {
export async function createStudent(userData: StudentDTO): Promise<StudentDTO> {
const studentRepository = getStudentRepository();
const newStudent = mapToStudent(userData);
await studentRepository.save(newStudent, { preventOverwrite: options?.preventOverwrite ?? true });
await studentRepository.save(newStudent);
return userData;
}
export async function createStudent(userData: StudentDTO): Promise<StudentDTO> {
return createOrUpdateStudent(userData, { preventOverwrite: true });
export async function createOrUpdateStudent(userData: StudentDTO): Promise<StudentDTO> {
await getStudentRepository().upsert({
username: userData.username,
firstName: userData.firstName,
lastName: userData.lastName
});
return userData;
}
export async function deleteStudent(username: string): Promise<StudentDTO> {

14
backend/src/services/teachers.ts
View file

@ -57,16 +57,22 @@ export async function getTeacher(username: string): Promise<TeacherDTO> {
return mapToTeacherDTO(user);
}
export async function createOrUpdateTeacher(userData: TeacherDTO, options?: { preventOverwrite?: boolean }): Promise<TeacherDTO> {
export async function createTeacher(userData: TeacherDTO): Promise<TeacherDTO> {
const teacherRepository: TeacherRepository = getTeacherRepository();
const newTeacher = mapToTeacher(userData);
await teacherRepository.save(newTeacher, { preventOverwrite: options?.preventOverwrite ?? true });
await teacherRepository.save(newTeacher);
return mapToTeacherDTO(newTeacher);
}
export async function createTeacher(userData: TeacherDTO): Promise<TeacherDTO> {
return await createOrUpdateTeacher(userData, { preventOverwrite: true });
export async function createOrUpdateTeacher(userData: TeacherDTO): Promise<TeacherDTO> {
await getTeacherRepository().upsert({
username: userData.username,
firstName: userData.firstName,
lastName: userData.lastName
});
return userData;
}
export async function deleteTeacher(username: string): Promise<TeacherDTO> {

1
frontend/src/services/auth/auth-service.ts
View file

@ -92,6 +92,7 @@ async function handleLoginCallback(): Promise<void> {
throw new Error("Login callback received, but the user is not logging in!");
}
authState.user = (await (await getUserManagers())[activeRole].signinCallback()) || null;
await apiClient.post("/auth/hello");
}
/**