From 2386bb39b3ed4ecc89f784fb3871ae717b47d01a Mon Sep 17 00:00:00 2001
From: cherif <batche@protonmail.com>
Date: Tue, 17 Jan 2023 00:46:49 +0100
Subject: [PATCH] Correction d'un autre bug mais dans la bonne fonction de
 luke.

---
 .../src/pages/profile/ProfileSettings.svelte  | 52 ++-----------------
 1 file changed, 5 insertions(+), 47 deletions(-)

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 4ab0277e..3d8427c4 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -30,57 +30,13 @@
 		set.tfa = user.isEnabledTwoFactorAuth;
 	})
 
-  const settingsHandler = async() => {
-    if ((set.username.trim() === '')) {
-      set.username = user.username
-    }
-    errors.username = ''
-	  await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`, {
-	  	method: 'PATCH',
-	  	headers: {
-	  	'Content-Type': 'application/json'
-	  	},
-	  	body: JSON.stringify({
-	  	"username": set.username,
-	  	"isEnabledTwoFactorAuth":  set.tfa
-	  	})
-	  })
-	  .then((response) => {
-	  	if (response.status === 200)
-      {
-        errors.username = ''
-	  		success.username = "Your changes have been saved"
-      }
-	  	else if (response.status === 201)
-	  		push("/2fa");
-      else if (response.status === 409)
-      {
-        success.username = ''
-        errors.username = `${set.username} is already in use, pick a different one.`;
-      }
-	  	else{
-        success.username = ''
-	  		errors.username = "Something went wrong";
-	  	}
-    }
-	  )
-	  .catch((err) => errors.username = err)
 	const settingsHandler = async() =>
 	{
-		// TODO Luke <--> Eric : Explications
-		// I don't really care which i use at this point...
-		// if (set.username === nameTmp) {
-		if ((set.username.trim() === '') && set.tfa === user.isEnabledTwoFactorAuth) {
-			errors.username = 'Invalid new username';
-			return;
-		}
-		else if ((set.username.trim() === '') && set.tfa !== user.isEnabledTwoFactorAuth) {
+
+		if ((set.username.trim() === '')) {
 			set.username = user.username
 		}
-		else {
-			errors.username = '';
-		}
-
+		errors.username = ''
 		await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`,
 			{
 				method: 'PATCH',
@@ -95,6 +51,7 @@
 		)
 		.then((response) => {
 			if (!response.ok) {
+				success.username = ''
 				errors.username = "Something went wrong";
 				if (response.status === 409) {
 					errors.username = `${set.username} is already in use, pick a different one.`;
@@ -103,6 +60,7 @@
 			}
 			else {
 				if (response.status === 200) {
+					errors.username = ''
 					success.username = "Your changes have been saved";
 				}
 				else if (response.status === 201) {