create account db connection

Author: Swaggeroo

routes/users.js

@@ -6,6 +6,8 @@ const bcrypt = require('bcrypt');
 const Joi = require("joi");
 const { sendVerificationEmail, sendPasswordResetEmail } = require('../services/mailer');
 const passwordComplexity = require("joi-password-complexity");
+//Services
+const dbAdapter = require('../services/dbAdapter');
 //Models
 const {validate, generateVerificationCode, generateAuthToken} = require('../models/User');
 //Middleware
@@ -20,17 +22,26 @@ router.post('/', async (req, res) => {
 
     //Generate hashed and salted password
     let user = _.pick(req.body, ['username', 'email', 'password']);
+
+    if (await dbAdapter.getUserByEmail(user.email)) {
+        debugRoute("POST /api/users - 400 - Email already registered");
+        return res.status(400).send('Email already registered.');
+    }
+
+    if (await dbAdapter.getUserByUsername(user.username)) {
+        debugRoute("POST /api/users - 400 - Username already registered");
+        return res.status(400).send('Username already registered.');
+    }
+
     const salt = bcrypt.genSaltSync(10);
     user.password = await bcrypt.hash(user.password, salt);
 
-    user.verificationCode = generateVerificationCode();
+    user.email_verification_code = generateVerificationCode();
     await sendVerificationEmail(user)
 
     user.lastSecurityUpdate = Date.now();
 
-    //TODO push to database and get id
-
-    user.id = 12;
+    user = await dbAdapter.createUser(user);
 
     debugRoute("POST /api/users - 200 - User created");
 

services/dbAdapter.js

@@ -1,5 +1,4 @@
 const { Client } = require('pg');
-const {func} = require("joi");
 const config = require('config');
 const debug = require('debug')('app:db');
 
@@ -91,7 +90,7 @@ async function updateUser(user) {
     return result.rows[0];
 }
 async function createUser(user) {
-    const result = await client.query('INSERT INTO users(username, email, password) VALUES($1, $2, $3) RETURNING *', [user.username, user.email, user.password]);
+    const result = await client.query('INSERT INTO users(username, email, password, email_verification_code) VALUES($1, $2, $3, $4) RETURNING *', [user.username, user.email, user.password, user.email_verification_code]);
     return result.rows[0];
 }
 

services/mailer.js

@@ -35,7 +35,7 @@ async function sendVerificationEmail(user) {
             to: user.email, // list of receivers
             subject: "Verify your email", // Subject line
             text: "Verify your email", // plain text body
-            html: `<h1>You registered for Turn2Green</h1><br><b>Verify your email:</b> <a href="${config.get('url')}/pages/verify.html?code=${user.verificationCode}">Verify</a>` // html body
+            html: `<h1>You registered for Turn2Green</h1><br><b>Verify your email:</b> <a href="${config.get('url')}/pages/verify.html?code=${user.email_verification_code}">Verify</a>` // html body
         }
 
         await sendMail(mailOptions);
@@ -51,7 +51,7 @@ async function sendPasswordResetEmail(user){
             to: user.email, // list of receivers
             subject: "Reset your password", // Subject line
             text: "Reset your password", // plain text body
-            html: `<h1>You requested to reset your password</h1><br><b>Reset your password:</b> <a href="${config.get('url')}/pages/resetPassword.html?code=${user.passwordResetCode}">Reset</a>` // html body
+            html: `<h1>You requested to reset your password</h1><br><b>Reset your password:</b> <a href="${config.get('url')}/pages/resetPassword.html?code=${user.email_verification_code}">Reset</a>` // html body
         }
 
         await sendMail(mailOptions);