oops i did some work directly on master, but it's still stable so should be fine
This commit is contained in:
@@ -34,7 +34,7 @@ export class AuthenticationController {
|
|||||||
console.log('ON EST DANS REDIRECT AUTH CONTROLLER');
|
console.log('ON EST DANS REDIRECT AUTH CONTROLLER');
|
||||||
console.log('On redirige');
|
console.log('On redirige');
|
||||||
if (request.user.isEnabledTwoFactorAuth === false)
|
if (request.user.isEnabledTwoFactorAuth === false)
|
||||||
return response.status(200).redirect('http://transcendance:8080/');
|
return response.status(200).redirect('http://transcendance:8080/#/profile');
|
||||||
return response.status(200).redirect('http://transcendance:8080/#/2fa');
|
return response.status(200).redirect('http://transcendance:8080/#/2fa');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,6 +74,9 @@ export class AuthenticationController {
|
|||||||
}
|
}
|
||||||
await this.userService.enableTwoFactorAuth(request.user.id);
|
await this.userService.enableTwoFactorAuth(request.user.id);
|
||||||
console.log('ON REDIRIGE');
|
console.log('ON REDIRIGE');
|
||||||
return response.status(200);
|
// return response.status(200);
|
||||||
|
// return 200;
|
||||||
|
// needs to be looked at by Cherif
|
||||||
|
return response.status(200).redirect('http://transcendance:8080/');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
let qrCodeImg;
|
let qrCodeImg;
|
||||||
let qrCode = "";
|
let qrCode = "";
|
||||||
let wrongCode = "";
|
let wrongCode = "";
|
||||||
|
// max try doesn't work if you reste the page
|
||||||
let maxTry = 3;
|
let maxTry = 3;
|
||||||
const fetchQrCodeImg = (async() => {
|
const fetchQrCodeImg = (async() => {
|
||||||
await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
|
await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
|
||||||
@@ -61,6 +62,7 @@
|
|||||||
if (response.status === 200) {
|
if (response.status === 200) {
|
||||||
// loginStatus.toggleTFA();
|
// loginStatus.toggleTFA();
|
||||||
loginStatus.update( (old) => ({...old, tfa: true}) );
|
loginStatus.update( (old) => ({...old, tfa: true}) );
|
||||||
|
//
|
||||||
push('/profile');
|
push('/profile');
|
||||||
console.log('vaid Code for 2FA')
|
console.log('vaid Code for 2FA')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ import { get } from 'svelte/store';
|
|||||||
// }
|
// }
|
||||||
// ]
|
// ]
|
||||||
// }),
|
// }),
|
||||||
// and example
|
|
||||||
// '/profile': wrap({
|
// '/profile': wrap({
|
||||||
// // Use a dynamically-loaded component for this
|
// // Use a dynamically-loaded component for this
|
||||||
// asyncComponent: () => import('./ProfilePage.svelte'),
|
// asyncComponent: () => import('./ProfilePage.svelte'),
|
||||||
@@ -86,6 +85,7 @@ import { get } from 'svelte/store';
|
|||||||
|
|
||||||
export const primaryRoutes = {
|
export const primaryRoutes = {
|
||||||
"/": SplashPage,
|
"/": SplashPage,
|
||||||
|
'/2fa': TwoFactorAuthentication,
|
||||||
"/profile": ProfilePage,
|
"/profile": ProfilePage,
|
||||||
"/profile/*": ProfilePage,
|
"/profile/*": ProfilePage,
|
||||||
'/unauthorized-access': UnauthorizedAccessPage,
|
'/unauthorized-access': UnauthorizedAccessPage,
|
||||||
|
|||||||
Reference in New Issue
Block a user