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

Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41

Browse source 
# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/base-controller.ts
This commit is contained in:
Gerald Schmittinger 2025-04-01 09:00:28 +02:00
commit 99dc346dc1
155 changed files with 3463 additions and 2931 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ const isLoggedIn = computed(() => authState.user !== null);
/**
* Redirect the user to the login page where he/she can choose whether to log in as a student or teacher.
*/
async function initiateLogin() {
async function initiateLogin(): Promise<void> {
await router.push(loginRoute);
}
@ -77,20 +77,20 @@ async function handleLoginCallback(): Promise<void> {
/**
* Refresh an expired authorization token.
*/
async function renewToken() {
async function renewToken(): Promise<User | null> {
const activeRole = authStorage.getActiveRole();
if (!activeRole) {
console.log("Can't renew the token: Not logged in!");
// FIXME console.log("Can't renew the token: Not logged in!");
await initiateLogin();
return;
return null;
}
try {
return await (await getUserManagers())[activeRole].signinSilent();
} catch (error) {
console.log("Can't renew the token:");
console.log(error);
} catch (_error) {
// FIXME console.log("Can't renew the token: " + error);
await initiateLogin();
}
return null;
}
/**
@ -113,7 +113,7 @@ apiClient.interceptors.request.use(
}
return reqConfig;
},
(error) => Promise.reject(error),
async (error) => Promise.reject(error),
);
// Registering interceptor to refresh the token when a request failed because it was expired.
@ -121,8 +121,8 @@ apiClient.interceptors.response.use(
(response) => response,
async (error: AxiosError<{ message?: string }>) => {
if (error.response?.status === 401) {
if (error.response!.data.message === "token_expired") {
console.log("Access token expired, trying to refresh...");
if (error.response.data.message === "token_expired") {
// FIXME console.log("Access token expired, trying to refresh...");
await renewToken();
return apiClient(error.config!); // Retry the request
} // Apparently, the user got a 401 because he was not logged in yet at all. Redirect him to login.