From 6c78f180751cc4fe4714db4aea16eff0a673cea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fouch=C3=A9?= <cfouche3005@gmail.com>
Date: Sun, 14 Apr 2024 12:37:34 +0200
Subject: [PATCH] Fix UTF-8 encoding

---
 src/js/AJAX/lib.js   | 3 +--
 src/php/db/Login.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/js/AJAX/lib.js b/src/js/AJAX/lib.js
index 87ed7dc..251ece4 100644
--- a/src/js/AJAX/lib.js
+++ b/src/js/AJAX/lib.js
@@ -1,7 +1,7 @@
 console.log("lib.js loaded");
 
 function TokenDecode(token){
-    let decodedToken = atob(token);
+    let decodedToken =  decodeURIComponent(atob(token).replace(/\s+/g, '').replace(/[0-9a-f]{2}/g, '%$&'));
     decodedToken = decodedToken.split(":");
     return {
         type: decodedToken[0],
@@ -12,5 +12,4 @@ function TokenDecode(token){
 
     };
 }
-
 export {TokenDecode};
\ No newline at end of file
diff --git a/src/php/db/Login.php b/src/php/db/Login.php
index 9a44970..80a3b9f 100644
--- a/src/php/db/Login.php
+++ b/src/php/db/Login.php
@@ -108,7 +108,7 @@ class LoginPatient {
             $result = $query->fetch(PDO::FETCH_ASSOC);
 
             if(password_verify($password,$result['p_password'])){
-                Response::HTTP200(['message' => 'Login success', 'token' => base64_encode("patient:".strval($result['p_id']).":".$result['p_name'].":".$result['p_surname'].":".$result['p_mail'])]);
+                Response::HTTP200(['message' => 'Login success', 'token' => base64_encode(bin2hex("patient:".strval($result['p_id']).":".$result['p_name'].":".$result['p_surname'].":".$result['p_mail']))]);
             } else {
                 Response::HTTP401(['message' => 'Login failed', 'token' => 0]);
             }
@@ -141,7 +141,7 @@ class LoginMedecin {
             $result = $query->fetch(PDO::FETCH_ASSOC);
 
             if(password_verify($password,$result['m_password'])){
-                Response::HTTP200(['message' => 'Login success', 'token' => base64_encode("medecin:".strval($result['m_id']).":".$result['m_name'].":".$result['m_surname'].":".$result['m_mail'])]);
+                Response::HTTP200(['message' => 'Login success', 'token' => base64_encode(bin2hex("medecin:".strval($result['m_id']).":".$result['m_name'].":".$result['m_surname'].":".$result['m_mail']))]);
             } else {
                 Response::HTTP401(['message' => 'Login failed', 'token' => 0]);
             }