From 6e139bdacc7b96e36f5766ff8371ce82eb0f6904 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 09:47:58 +0100 Subject: [PATCH 1/7] username sanitize --- .../nestjs/api_back/src/users/dto/create-users.dto.ts | 3 ++- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts index 3c0e6472..8b1a2529 100644 --- a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts +++ b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts @@ -1,9 +1,10 @@ -import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; +import { IsBoolean, Matches, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; import { isSet } from 'util/types'; export class CreateUsersDto { @IsString() @IsNotEmpty() + @Matches(/^[a-zA-Z0-9'-_]+$/) readonly username: string; readonly fortyTwoId: string; @IsEmail() 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 95cc047b..f4fa2699 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -51,7 +51,7 @@ .then((response) => { if (!response.ok) { success.username = '' - errors.username = "Something went wrong"; + errors.username = "Use [a-zA-Z0-9] and - _ ."; if (response.status === 409) { errors.username = `${set.username} is already in use, pick a different one.`; } From 86b8ab74a28a0eb684369801cc2cde98b9c7d93f Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 10:16:47 +0100 Subject: [PATCH 2/7] =?UTF-8?q?correction=20d'un=20appel=20non=20prot?= =?UTF-8?q?=C3=A9g=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nestjs/api_back/src/chat/chat.service.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts index a97d9004..8313583b 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts @@ -372,11 +372,14 @@ export class ChatService { async getListBlockUser(username: string): Promise { printCaller("-- in "); - + let users: string[] = []; let user = await this.getUserByName(username); - let friends_users = await this.friendshipService.findAllBlockedFriends(user.id); - let users = friends_users.map(user => user.receiverUsername); - + console.log("USERNAME CHAT SRVICE " + username); + let friends_users; + if (user) + friends_users = await this.friendshipService.findAllBlockedFriends(user.id); + if (friends_users) + users = friends_users.map(user => user.receiverUsername); printCaller("-- out "); return users; } From 86a507fdf61944b7505062a7bf73fdd2ea54f493 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 10:29:32 +0100 Subject: [PATCH 3/7] add a max lenght for username --- .../nestjs/api_back/src/users/dto/create-users.dto.ts | 3 ++- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts index 8b1a2529..9b61c95a 100644 --- a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts +++ b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts @@ -1,10 +1,11 @@ -import { IsBoolean, Matches, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; +import { IsBoolean, Matches, MaxLength, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; import { isSet } from 'util/types'; export class CreateUsersDto { @IsString() @IsNotEmpty() @Matches(/^[a-zA-Z0-9'-_]+$/) + @MaxLength(50) readonly username: string; readonly fortyTwoId: string; @IsEmail() 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 f4fa2699..a5058dee 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -51,7 +51,7 @@ .then((response) => { if (!response.ok) { success.username = '' - errors.username = "Use [a-zA-Z0-9] and - _ ."; + errors.username = "Max length : 50 . Use [a-zA-Z0-9] and - _ ."; if (response.status === 409) { errors.username = `${set.username} is already in use, pick a different one.`; } From b4139283e153524f2bd0fcd11c44dde780852e10 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:08:34 +0100 Subject: [PATCH 4/7] different new username when another one exist at the first connection --- .../nestjs/api_back/src/auth/42/authentication.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts b/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts index b338ce7b..3d4098ac 100644 --- a/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts +++ b/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts @@ -24,10 +24,12 @@ export class AuthenticationService { if (!check_name) return await this.userService.create(createUsersDto); let createUsersDtoWithUsername : CreateUsersDto = createUsersDto; + let i = 0; while (check_name === true) { - createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + randomUUID() }; + createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + '_' + i}; check_name = await this.userService.isUsernameExists(createUsersDtoWithUsername.username); + i++; } return this.userService.create(createUsersDtoWithUsername); } From 4c5580bbf36511482095529987087dd483c83bc9 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:19:43 +0100 Subject: [PATCH 5/7] =?UTF-8?q?rajout=20d'un=20texte=20de=20succes=20qui?= =?UTF-8?q?=20avait=20=C3=A9t=C3=A9=20enlev=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 3 +++ 1 file changed, 3 insertions(+) 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 a5058dee..426c7bb5 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -93,9 +93,11 @@ ) .then((response) => { if (!response.ok) { + success.avatar = '' errors.avatar = response.statusText; throw new Error("HTTP " + response.status); } + errors.avatar = '' uploadAvatarSuccess = true; success.avatar = 'Your avatar has been updated'; }) @@ -144,6 +146,7 @@
Pick a new Avatar
{errors.avatar}
+
{success.avatar}
From d9fc3b49be2850f07330d865c36764df5db2eab7 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:22:53 +0100 Subject: [PATCH 6/7] =?UTF-8?q?couleurs=20blanc=20sur=20blanc=20corrig?= =?UTF-8?q?=C3=A9es=20pour=20upload=20avatar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 1 + 1 file changed, 1 insertion(+) 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 426c7bb5..97f25816 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -192,6 +192,7 @@ .form-field { padding: 10px; + color: #333; } .label { From d8317350b0ed2a45ba117c60780c2c4ef5f83c37 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Tue, 17 Jan 2023 12:18:42 +0100 Subject: [PATCH 7/7] fix font load for canvas --- .../svelte/api_front/public/global.css | 10 ++++++++++ .../svelte/api_front/src/pages/game/Game.svelte | 17 +++++++++-------- .../src/pages/game/GameSpectator.svelte | 16 ++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/srcs/requirements/svelte/api_front/public/global.css b/srcs/requirements/svelte/api_front/public/global.css index 4a77fd07..25ba58a6 100644 --- a/srcs/requirements/svelte/api_front/public/global.css +++ b/srcs/requirements/svelte/api_front/public/global.css @@ -26,6 +26,16 @@ body { font-display: swap; } +@font-face { + font-family: "Bit5x3"; + src: + url("/fonts/Bit5x3.woff2") format("woff2"), + local("Bit5x3"), + url("/fonts/Bit5x3.woff") format("woff"); + font-weight: normal; + font-style: normal; + font-display: swap; +} a { color: rgb(0,100,200); diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index ccb4242a..855ef0c4 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -390,19 +390,20 @@ {/if} {/if} +
.
+