From ad316c6d78679f27f362d8664e68d43dca0de836 Mon Sep 17 00:00:00 2001
From: QuantumEntangledAndy <sheepchaan@gmail.com>
Date: Wed, 9 Oct 2024 15:09:10 +0700
Subject: [PATCH] [chore] Use same basic code logic in user as in basicAuth

---
 src/users.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/users.js b/src/users.js
index 8d5d70630..4fb85ab0d 100644
--- a/src/users.js
+++ b/src/users.js
@@ -656,22 +656,25 @@ async function basicUserLogin(request) {
         return false;
     }
 
-    const authHeader = request.get('Authorization');
+    const authHeader = request.headers.authorization;
+
     if (!authHeader) {
         return false;
     }
 
-    const parts = authHeader.split(' ');
-    if (!parts || parts.length < 2 || parts[0].toLowerCase() !== 'basic') {
+    const [scheme, credentials] = authHeader.split(' ');
+
+    if (scheme !== 'Basic' || !credentials) {
         return false;
     }
 
-    const b64auth = parts[1];
-    const [login, password] = Buffer.from(b64auth, 'base64').toString().split(':');
+    const [username, password] = Buffer.from(credentials, 'base64')
+        .toString('utf8')
+        .split(':');
 
     const userHandles = await getAllUserHandles();
     for (const userHandle of userHandles) {
-        if (login === userHandle) {
+        if (username === userHandle) {
             const user = await storage.getItem(toKey(userHandle));
             // Verify pass again here just to be sure
             if (user && user.enabled && user.password && user.password === getPasswordHash(password, user.salt)) {