Merge pull request #24 from BreizhHardware/cfouche

Fix UTF-8 encoding
This commit is contained in:
cfouche
2024-04-14 12:38:14 +02:00
committed by GitHub
2 changed files with 3 additions and 4 deletions

View File

@@ -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};

View File

@@ -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]);
}