Database connected

Author: Swaggeroo

routes/otp.js

@@ -2,21 +2,22 @@ const express = require('express');
 const router = express.Router();
 const debugRoute = require('debug')('app:route');
 const speakeasy = require('speakeasy');
+//Services
+const dbAdapter = require('../services/dbAdapter');
 //Models
 const {generateAuthToken} = require('../models/User');
 //Middleware
 const auth = require('../middleware/auth');
 
 router.get('/generate', auth, async (req, res) => {
-    //TODO get user from database
-    let user = {};
+    let user = await dbAdapter.getUserById(req.user.id);
 
     if (!user) {
         debugRoute("GET /api/otp/generate - 404 - User not found");
         return res.status(404).send('User not found.');
     }
 
-    if (user.otp_enabled && user.otp_verified) {
+    if (user.totp_secret !== undefined && user.totp_confirmed) {
         debugRoute("GET /api/otp/generate - 400 - OTP already enabled");
         return res.status(400).send('OTP already enabled.');
     }
@@ -25,7 +26,7 @@ router.get('/generate', auth, async (req, res) => {
     let secret = speakeasy.generateSecret().base32;
     user.totp_secret = secret;
 
-    //TODO save user
+    await dbAdapter.updateUser(user);
 
     debugRoute("GET /api/otp/generate - 200 - OTP generated");
 
@@ -38,8 +39,7 @@ router.post('/verify', auth, async (req, res) => {
         return res.status(400).send("Token required");
     }
 
-    //TODO get user from database and change me
-    let user = {totp_secret: "someting"};
+    let user = await dbAdapter.getUserById(req.user.id);
 
     if (!user) {
         debugRoute("POST /api/otp/verify - 404 - User not found");
@@ -52,13 +52,11 @@ router.post('/verify', auth, async (req, res) => {
     }
 
     let verified = speakeasy.totp.verify({
-        secret: user.otp_secret,
+        secret: user.totp_secret,
         encoding: 'base32',
         token: req.body.token,
         window: 1
     });
-    //TODO change me
-    verified = true;
 
     if (!verified) {
         debugRoute("POST /api/otp/verify - 400 - Invalid token");
@@ -67,8 +65,8 @@ router.post('/verify', auth, async (req, res) => {
 
     if (!user.totp_confirmed) {
         user.totp_confirmed = true;
-        user.lastSecurityUpdate = Date.now();
-        //TODO save User
+        user.last_security_change = Date.now();
+        await dbAdapter.updateUser(user);
     }
 
     debugRoute("POST /api/otp/verify - 200 - OTP verified");
@@ -77,30 +75,27 @@ router.post('/verify', auth, async (req, res) => {
 });
 
 router.post('/disable', auth, async (req, res) => {
-    //TODO get user from database
+    let user = dbAdapter.getUserById(req.user.id);
 
-    let user = {};
     if (!user) {
         debugRoute("POST /api/otp/disable - 404 - User not found");
         return res.status(404).send('User not found.');
     }
 
-    //TODO change me
-    user.totp_confirmed = true;
     if (!user.totp_confirmed) {
         debugRoute("POST /api/otp/disable - 400 - OTP not enabled");
         return res.status(400).send('OTP not enabled.');
     }
 
     user.totp_secret = undefined;
     user.totp_confirmed = false;
-    user.lastSecurityUpdate = Date.now();
+    user.last_security_change = Date.now();
 
-    //save user
+    await dbAdapter.updateUser(user);
 
     debugRoute("POST /api/otp/disable - 200 - OTP disabled");
 
-    res.send(generateAuthToken(false,false));
+    res.send(generateAuthToken(user.id, user.admin,false,false));
 });
 
 module.exports = router;

routes/users.js

@@ -112,7 +112,6 @@ router.post('/password/reset/request/:email', async (req, res) => {
     }
 
     user.email_verification_code = generateVerificationCode();
-    user.last_security_change = Date.now();
     user.last_email_send = Date.now()
 
     await dbAdapter.updateUser(user);
@@ -140,19 +139,19 @@ router.put('/password/reset/:code', async (req, res) => {
     }
 
     //TODO get user from database
-    //let user = dbAdapter;
+    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");
     //}
 
     const salt = bcrypt.genSaltSync(10);
     user.password = await bcrypt.hash(req.body.password, salt);
-    user.passwordResetCode = undefined;
-    user.passwordResetTime = undefined;
-    user.lastSecurityUpdate = Date.now();
+    user.email_verification_code = undefined;
+    user.last_email_send = undefined;
+    user.last_security_change = Date.now();
 
-    //TODO push to Server
+    await dbAdapter.updateUser(user);
 
     debugRoute("GET /api/users/password/reset/:code - 200 - Password reset");
 

routes/verification.js

@@ -3,6 +3,8 @@ const router = express.Router();
 const debugRoute = require('debug')('app:route');
 const {sendVerificationEmail} = require("../services/mailer");
 const Joi = require("joi");
+//Services
+const dbAdapter = require('../services/dbAdapter');
 //Models
 const {generateVerificationCode} = require('../models/User');
 
@@ -12,9 +14,7 @@ router.post('/resend/:email', async (req, res) => {
         return res.status(400).send("Invalid email");
     }
 
-    //TODO get user from database
-
-    let user = {};
+    let user = await dbAdapter.getUserByEmail(req.params.email);
     if (!user) {
         debugRoute("POST /api/verification/resend/:email - 404 - User not found");
         return res.status(404).send('User not found.');
@@ -30,11 +30,11 @@ router.post('/resend/:email', async (req, res) => {
         return res.status(400).send('User already verified.');
     }
 
-    user.verificationCode = generateVerificationCode();
-    user.verificationCodeSent = Date.now();
+    user.email_verification_code = generateVerificationCode();
+    user.last_email_send = Date.now();
     sendVerificationEmail(user)
 
-    //TODO save user
+    await dbAdapter.updateUser(user);
 
     debugRoute("POST /api/verification/resend/:email - 200 - Verification code resent");
 
@@ -55,16 +55,16 @@ router.post('/verify/:code', async (req, res) => {
     //TODO find user in database
     let user = {}
 
-    if (user.verificationCodeSent < Date.now() - 259200000) {
+    if (user.last_email_send < Date.now() - 259200000) {
         debugRoute("POST /api/verification/verify/:code - 400 - Verification code expired");
         return res.status(400).send('Verification code expired.');
     }
 
-    user.active = true;
-    user.verificationCode = undefined;
-    user.verificationCodeSent = undefined;
+    user.email_confirmed = true;
+    user.email_verification_code = undefined;
+    user.last_email_send = undefined;
 
-    //TODO save user
+    await dbAdapter.updateUser(user);
 
     debugRoute("POST /api/verification/verify/:code - 200 - User verified");