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

getting fix for deleting a user

Browse Source
This commit is contained in:
Me
2023-01-17 16:00:35 +01:00
parent 29d0e0a8b6 c2812c0534
commit 2ac1d4c1bb
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
View File

@@ -146,7 +146,8 @@ export class ChatService {
const user_db = await this.getUserByName(username); const user_db = await this.getUserByName(username);
printCaller("-- out "); printCaller("-- out ");
return user_db.currentRoom; if (user_db)
return user_db.currentRoom;
} }
async getRoomByName(room_name: string, fieldsToReturn: string[] = null): Promise<Chatroom> async getRoomByName(room_name: string, fieldsToReturn: string[] = null): Promise<Chatroom>

4
srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
View File

@@ -43,10 +43,10 @@ export class User {
@Column({ nullable: true }) @Column({ nullable: true })
secretTwoFactorAuth: string; secretTwoFactorAuth: string;
@OneToMany(type => Friendship , (friendship) => friendship.sender, { onDelete: 'CASCADE' }) @OneToMany(type => Friendship , (friendship) => friendship.sender, {onDelete: 'CASCADE'})
sentFriendRequest: Friendship[]; sentFriendRequest: Friendship[];
@OneToMany(type => Friendship , (friendship) => friendship.receiver, { onDelete: 'CASCADE' }) @OneToMany(type => Friendship , (friendship) => friendship.receiver, {onDelete: 'CASCADE'})
receivedFriendRequest: Friendship[]; receivedFriendRequest: Friendship[];
@JoinColumn() @JoinColumn()

12
srcs/requirements/nestjs/api_back/src/users/users.controller.ts
View File

@@ -1,5 +1,5 @@
import { import {
Body, Controller, Delete, Get, NotFoundException,HttpStatus, Param, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors, Next, Body, Controller, Delete, Get, NotFoundException,HttpStatus, Next, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors
} from '@nestjs/common'; } from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express'; import { FileInterceptor } from '@nestjs/platform-express';
import { Response } from 'express'; import { Response } from 'express';
@@ -73,14 +73,14 @@ export class UsersController {
@UseGuards(AuthenticateGuard) @UseGuards(AuthenticateGuard)
@UseGuards(TwoFactorGuard) @UseGuards(TwoFactorGuard)
@Delete() @Delete()
remove(@Req() request, @Res() response, @Next() next) { remove(@Req() req, @Res() response, @Next() next) {
this.usersService.remove(request.user.id); this.usersService.remove(req.user.id);
request.logout(function(err) { req.logout(function(err) {
if (err) { return next(err); } if (err) { return next(err); }
response.redirect('/'); response.redirect('/');
}); });
request.session.cookie.maxAge = 0; req.session.cookie.maxAge = 0;
return {msg : 'You have deleted your account'}; return {msg : 'Your account has been deleted'};
} }

3
srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
View File

@@ -125,7 +125,6 @@
}); });
} }
</script> </script>
@@ -170,7 +169,7 @@
</form> </form>
</Card> </Card>
</div> </div>
<Button type="primary" on:click={() => deleteAccount()}>Delete Account</Button> <Button type="primary" on:click={() => deleteAccount()}>Delete Account</Button>
</div> </div>
</main> </main>