Merge pull request #18 from Wayfinder-CS262-2020/auth

Fix for timed out response

Author: TheDunco

.gitignore

@@ -9,4 +9,7 @@ npm-debug.log
 
 # Docker
 Dockerfile
-docker-compose.yml
+docker-compose.yml
+
+# HTTP Test file
+test.http

app.js

@@ -105,26 +105,27 @@ function auth(req, res, next) {
   const email = req.body.email;
   const username = req.body.email.split('@')[0]
   const password = req.body.password;
-  console.log(req.body)
   if (email && password) {
     db.oneOrNone(`SELECT pass FROM accounts WHERE email = $1`, [
       email,
     ]) // Request the hashed password from the db
       .then((data) => {
         if (data) {
-          console.log(data.pass)
 
           if (bcrypt.compareSync(password, data.pass)) { // compare the hashed password with the login password
             const accessToken = jwt.sign({ username: username }, accessTokenSecret) // create a signed jwt
+            console.log("login successful")
             res.json(
               {
                 accessToken // respond with the token
               }
             );
           } else {
 
-            res.send('Invalid Login Details!')
+            res.send('Invalid Login Details!') // Password incorrect
           }
+        } else {
+          res.send('Invalid Login Details!') // Email incorrect
         }
       })
       .catch((err) => {

test.http

@@ -2,6 +2,6 @@ POST https://wayfinder-de-auth-gzffdob0fkfq.herokuapp.com/auth/login
 Content-Type: application/json
 
 {
-    "email": "qwerty12@calvin.edu",
-    "password" : "strongpassword"
+    "email": "qwer1212@students.calvin.edu",
+    "password" : "strongpassworawef"
 }