42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction d'un bug qui ne mettait pas à jour le statut lorsque l'on quittait et revenait se connecter sur le site

Browse Source
This commit is contained in:
cherif
2023-01-13 14:25:08 +01:00
parent 8e99a764f7
commit 97f0a52b2c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
srcs/requirements/nestjs/api_back/src/auth/42/authentication.controller.ts
View File

@@ -5,6 +5,7 @@ import { Response } from 'express';
import { TwoFaDto } from './dto/2fa.dto'; import { TwoFaDto } from './dto/2fa.dto';
import { UsersService } from 'src/users/users.service'; import { UsersService } from 'src/users/users.service';
import { User } from 'src/users/entities/user.entity'; import { User } from 'src/users/entities/user.entity';
import { STATUS } from 'src/common/constants/constants';
@Controller('auth') @Controller('auth')
export class AuthenticationController { export class AuthenticationController {
@@ -36,6 +37,7 @@ export class AuthenticationController {
console.log('On redirige'); console.log('On redirige');
const user : User = request.user const user : User = request.user
if (user.isEnabledTwoFactorAuth === false || user.isTwoFactorAuthenticated === true){ if (user.isEnabledTwoFactorAuth === false || user.isTwoFactorAuthenticated === true){
this.userService.updateStatus(user.id, STATUS.CONNECTED)
console.log('ON VA VERS PROFILE'); console.log('ON VA VERS PROFILE');
return response.status(200).redirect('http://' + process.env.WEBSITE_HOST + ':' + process.env.WEBSITE_PORT + '/#/profile'); return response.status(200).redirect('http://' + process.env.WEBSITE_HOST + ':' + process.env.WEBSITE_PORT + '/#/profile');
} }
@@ -51,7 +53,7 @@ export class AuthenticationController {
@UseGuards(AuthenticateGuard) @UseGuards(AuthenticateGuard)
logout(@Req() request, @Res() response, @Next() next) { logout(@Req() request, @Res() response, @Next() next) {
this.userService.setIsTwoFactorAuthenticatedWhenLogout(request.user.id); this.userService.setIsTwoFactorAuthenticatedWhenLogout(request.user.id);
this.userService.updateStatus(request.user.id, 'disconnected'); this.userService.updateStatus(request.user.id, STATUS.DISCONNECTED);
request.logout(function(err) { request.logout(function(err) {
if (err) { return next(err); } if (err) { return next(err); }
response.redirect('/'); response.redirect('/');
@@ -83,6 +85,7 @@ export class AuthenticationController {
throw new UnauthorizedException('Wrong Code.'); throw new UnauthorizedException('Wrong Code.');
await this.userService.authenticateUserWith2FA(request.user.id); await this.userService.authenticateUserWith2FA(request.user.id);
console.log('ON REDIRIGE'); console.log('ON REDIRIGE');
this.userService.updateStatus(user.id, STATUS.CONNECTED)
return response.status(200).redirect('http://' + process.env.WEBSITE_HOST + ':' + process.env.WEBSITE_PORT + '/#/profile'); return response.status(200).redirect('http://' + process.env.WEBSITE_HOST + ':' + process.env.WEBSITE_PORT + '/#/profile');
} }
} }