Database connected

Author: Swaggeroo

app.js

@@ -53,6 +53,4 @@ dbAdapter.connectToDatabase();
 
 //start application
 const port = process.env.PORT || 3000;
-app.listen(port, () => debugStartup(`Listening on port ${port}...`));
-
-
+app.listen(port, () => debugStartup(`Listening on port ${port}...`));

routes/users.js

@@ -123,6 +123,11 @@ router.post('/password/reset/request/:email', async (req, res) => {
 });
 
 router.put('/password/reset/:code', async (req, res) => {
+    if (!req.params.code) {
+        debugRoute("POST /api/verification/verify/:code - 400 - Code required");
+        return res.status(400).send("Code required");
+    }
+
     if (!req.body.password) {
         debugRoute("GET /api/users/password/reset/:code - 400 - No password provided");
         return res.status(400).send("No password provided");
@@ -138,12 +143,11 @@ router.put('/password/reset/:code', async (req, res) => {
         return res.status(400).send(error.details[0].message);
     }
 
-    //TODO get user from database
-    let user = {};
-    //if (Date.now() - user.passwordResetTime > 600000) {
-    //    debugRoute("GET /api/users/password/reset/:code - 400 - Reset code expired");
-    //    return res.status(400).send("Reset code expired");
-    //}
+    let user = await dbAdapter.getUserByEmailVerificationCode(req.params.code);
+    if (Date.now() - user.last_email_send > 600000) {
+        debugRoute("GET /api/users/password/reset/:code - 400 - Reset code expired");
+        return res.status(400).send("Reset code expired");
+    }
 
     const salt = bcrypt.genSaltSync(10);
     user.password = await bcrypt.hash(req.body.password, salt);

routes/verification.js

@@ -52,8 +52,7 @@ router.post('/verify/:code', async (req, res) => {
         return res.status(400).send("Invalid code");
     }
 
-    //TODO find user in database
-    let user = {}
+    let user = await dbAdapter.getUserByEmailVerificationCode(req.params.code);
 
     if (user.last_email_send < Date.now() - 259200000) {
         debugRoute("POST /api/verification/verify/:code - 400 - Verification code expired");

services/dbAdapter.js

@@ -34,6 +34,13 @@ async function getUserByUsername(username) {
     return result.rows[0];
 }
 
+async function getUserByEmailVerificationCode(code) {
+    // Abfrage ausführen
+    const result = await client.query('SELECT * FROM users WHERE email_verification_code = $1', [code])
+    return result.rows[0];
+}
+
+
 async function updateUser(user) {
     const query = `
   UPDATE users
@@ -115,5 +122,6 @@ module.exports = {
     disconnectFromDatabase,
     createUser,
     getUserByUsername,
-    updateUser
+    updateUser,
+    getUserByEmailVerificationCode
 }