Email validation working

server/accounts/index.js

@@ -3,5 +3,6 @@ const router = express.Router();
 
 //basic account management
 router.post('/signup', require('./signup'));
+router.get('/validation', require('./validation'));
 
 module.exports = router;

server/accounts/signup.js

@@ -9,7 +9,6 @@ const { bannedEmails, accounts, pendingSignups } = require('../database/models')
 //utilities
 const validateEmail = require('../../common/utilities/validate-email.js');
 const validateUsername = require('../../common/utilities/validate-username.js');
-const sequelize = require('../database');
 
 //api/accounts/signup
 const route = async (req, res) => {
@@ -24,16 +23,16 @@ const route = async (req, res) => {
 	const hash = await bcrypt.hash(req.fields.password, salt);
 
 	//generate the validation field
-	const verify = Math.floor(Math.random() * 2000000000);
+	const token = Math.floor(Math.random() * 2000000000);
 
 	//register signup
-	const signupErr = await registerPendingSignup(req.fields, hash, verify);
+	const signupErr = await registerPendingSignup(req.fields, hash, token);
 	if (signupErr) {
 		return res.status(500).send(signupErr);
 	}
 
 	//send the validation email
-	const emailErr = await sendValidationEmail(req.fields.email, verify);
+	const emailErr = await sendValidationEmail(req.fields.email, req.fields.username, token);
 	if (emailErr) {
 		return res.status(500).send(emailErr);
 	}
@@ -97,20 +96,20 @@ const validateDetails = async (fields) => {
 	return null;
 };
 
-const registerPendingSignup = async (fields, hash, verify) => {
+const registerPendingSignup = async (fields, hash, token) => {
 	const record = await pendingSignups.upsert({
 		email: fields.email,
 		username: fields.username,
 		hash: hash,
-		verify: verify
+		token: token
 	});
 
 	return null;
 };
 
-const sendValidationEmail = async (email, verify) => {
-	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/api/verify?verify=${verify}`;
-	const msg = `Hello! Please visit the following address to verify your account: ${addr}`;
+const sendValidationEmail = async (email, username, token) => {
+	const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/api/accounts/validation?username=${username}&token=${token}`;
+	const msg = `Hello! Please visit the following address to validate your account: ${addr}`;
 
 	//what exactly is a transport?
 	let transporter = nodemailer.createTransport({

server/accounts/validation.js

@@ -0,0 +1,39 @@
+const { pendingSignups, accounts } = require('../database/models');
+
+//api/accounts/validation
+const route = async (req, res) => {
+	//get the existing pending signup
+	const info = await pendingSignups.findOne({
+		where: {
+			username: req.query.username
+		}
+	});
+
+	//check the given info
+	if (!info) {
+		return res.status(401).send('validation failed');
+	}
+
+	if (info.token != req.query.token) {
+		return res.status(401).send('tokens do not match');
+	}
+
+	//delete the pending signup
+	pendingSignups.destroy({
+		where: {
+			username: req.query.username
+		}
+	});
+
+	//move data to the accounts table
+	accounts.create({
+		email: info.email,
+		username: info.username,
+		hash: info.hash
+	});
+
+	//finally
+	res.status(200).send('Validation succeeded!');
+};
+
+module.exports = route;

server/database/index.js

@@ -1,7 +1,7 @@
 const Sequelize = require('sequelize');
 
 const sequelize = new Sequelize(process.env.DB_DATABASE, process.env.DB_USERNAME, process.env.DB_PASSWORD, {
-	host: '127.0.0.1',
+	host: process.env.DB_HOSTADDR,
 	dialect: 'mariadb',
 	logging: false
 });

server/database/models/accounts.js

@@ -28,7 +28,7 @@ module.exports = sequelize.define('accounts', {
 
 	hash: 'varchar(100)', //for passwords
 
-	expiry: {
+	deletion: {
 		type: 'DATETIME',
 		allowNull: true,
 		defaultValue: null

server/database/models/pending-signups.js

@@ -14,5 +14,5 @@ module.exports = sequelize.define('pendingSignups', {
 
 	hash: 'varchar(100)', //for passwords
 
-	verify: Sequelize.INTEGER(11)
+	token: Sequelize.INTEGER(11)
 });