From 365bac36efce1d58cde325eaef04ca9877f19952 Mon Sep 17 00:00:00 2001 From: batche Date: Wed, 7 Dec 2022 20:38:11 +0100 Subject: [PATCH] 2A la suite --- .../nestjs/api_back/src/users/users.controller.ts | 4 ++++ .../svelte/api_front/src/pages/TwoFactorAuthentication.svelte | 1 - .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts index 21cccb1d..452690a4 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts @@ -10,6 +10,7 @@ import { UsersService } from './users.service'; import { User } from './entities/user.entity'; import { of } from 'rxjs'; import { storageForAvatar } from 'src/common/constants/constants'; +import { use } from 'passport'; @Controller('user') @@ -66,12 +67,15 @@ export class UsersController { console.log("DANS PATCH USERS"); const user = await this.usersService.update(req.user.id, usersUpdateDto); // const user : User = req.user; + if (user.isEnabledTwoFactorAuth === false && user.isTwoFactorAuthenticated === true) + this.usersService.setIsTwoFactorAuthenticatedWhenLogout(user.id); console.log ("Enbale 2FA " + user.isEnabledTwoFactorAuth + " Is authenticated " + user.isTwoFactorAuthenticated); if (user.isEnabledTwoFactorAuth === true && user.isTwoFactorAuthenticated === false) { console.log("On est dans la boucle de redirection 2FA / Au niveau de l'update du user") return response.status(200).redirect("http://transcendance:8080/#/2fa"); } + return response.status(200).redirect("http://transcendance:8080/#/profile") } @UseGuards(AuthenticateGuard) diff --git a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte index c528bf90..d7ce08c2 100644 --- a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte @@ -48,7 +48,6 @@ wrongCode = `Wrong code`; } if (response.status === 200) { - // userLogout(); push('/profile'); console.log('valid Code for 2FA') } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index 2da66198..4d215982 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -77,7 +77,6 @@ .then(response => response.json()) // .then((result) => console.log(result)) // .then(() => console.log('successful sub of new settings')) - } };