Fix user login

1 files changed, 6 insertions, 6 deletions

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",