Fix user login

4 files changed, 13 insertions, 8 deletions

diff --git a/README.md b/README.md
index 440b402..abec164 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@
 Unofficial Franz server replacement for use with the Ferdi Client.
 
 ## Features
-- [x] User registration
-- [ ] User login (not yet functional)
+- [x] User registration and login
 - [x] Service creation, download and listing
 - [ ] Service removing
 - [ ] Functioning service store
diff --git a/app/Controllers/Http/UserController.js b/app/Controllers/Http/UserController.js
index 88f7ecd..062e16f 100644
--- a/app/Controllers/Http/UserController.js
+++ b/app/Controllers/Http/UserController.js
@@ -32,21 +32,21 @@ class UserController {
     response,
     auth
   }) {
-    const authHeader = atob(request.header('Authorization')).split(':');
+    const authHeader = atob(request.header('Authorization').replace('Basic ', '')).split(':');
 
-    let user = (await User.query().where('email', authHeader[0]).limit(1).fetch()).toJSON();
-    if (!user[0] || !user[0].email) {
+    let user = (await User.query().where('email', authHeader[0]).first());
+    if (!user || !user.email) {
       return response.status(401).send({
-        "message": "User credentials not valid",
+        "message": "User credentials not valid (Invalid mail)",
         "code": "invalid-credentials",
         "status": 401
       });
     }
 
+
     let token;
     try {
-      // TODO: Login is currently not working as the password is incorrect
-      token = await auth.attempt(user[0].id, authHeader[1])
+      token = await auth.attempt(user.email, authHeader[1])
     } catch (e) {
       return response.status(401).send({
         "message": "User credentials not valid",
diff --git a/package.json b/package.json
index 2c8179f..aeba103 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "@adonisjs/ignitor": "^2.0.8",
     "@adonisjs/lucid": "^6.1.3",
     "atob": "^2.1.2",
+    "node-fetch": "^2.6.0",
     "pg": "^7.12.1",
     "sqlite3": "^4.1.0",
     "uuid": "^3.3.3"
diff --git a/yarn.lock b/yarn.lock
index d9558e7..26f1e52 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2213,6 +2213,11 @@ node-exceptions@^3.0.0:
   resolved "https://registry.yarnpkg.com/node-exceptions/-/node-exceptions-3.0.0.tgz#48b8e10da71370845ef1af583778139527308d11"
   integrity sha512-pFhMAqdN1avrFwtZs66HxYiVnbnH9wjXB4m8IKs5Z9+r7U5voqxT+EDbVkRfge+V7JnkOgKhN4HfKBn1o5g9Wg==
 
+node-fetch@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
 node-pre-gyp@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"