Merge branch 'dev'

Merge dev -> master | test & rebuild of new version of code.

In this code changes, I've refactored a little bit of code and more
importantly, I've tested the new version of accountCleanup.js, and
fixed the sequelize bugs within index.js ( these happend when the
sequelize import was removed ).

Hope that was clear.
Massiles.

Author: MassiGy

src/controllers/User/Account/signup.js

@@ -59,18 +59,18 @@ module.exports.signup = async (req, res) => {
 								},
 							)
 								.then((data) => {
-
+									// generate token
 									const id_token = sign({ id: data.id }, process.env.EMAIL_TOKEN, { expiresIn: "10 days", });
 
+									// build-up the email markup
+									let emailData = fs.readFileSync(path.join(process.cwd(), "/res/emails/confirmEmail.html"), 'ascii');
+
 									emailData = emailData.replace('${data.username}', data.username);
 									emailData = emailData.replace('${id_token}', id_token);
 
 									// send the email
 									mailer(emailData, String(data.email), 'Confirm Your Email Address');
 
-									// send the email 
-									mailer(emailData, String(data.email), "Confirm Your Email Address")
-
 									res.json({
 										token: sign(
 											{

src/index.js

@@ -2,7 +2,8 @@ require('dotenv').config();
 
 // Configure Imports
 const express = require('express');
-const sequelize = require("sequelize");
+const { Sequelize } = require('sequelize');
+const models = require('./models');
 const schedule = require('node-schedule');
 const { removeUnconfirmedAccounts, emailConfirmationRemainder } = require('./jobs/accountCleanup');
 
@@ -14,7 +15,7 @@ const port = process.env.PORT || 8080;
 app.use(express.static('public'));
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
-app.use(require('cors')({ origin: 'https://fairfieldprogramming.org' }));
+app.use(require('cors')({ origin: '*' }));
 
 // Programs
 app.get('/', require('./routes/index'));
@@ -36,15 +37,15 @@ app.use('/user', require('./routes/userRoutes'));
 
 // Sync the Database
 (async () => {
+
   // await the database creation process, so as we can access the data on our jobs
   await sequelize.sync();
   app.emit('database-started');
 
   // this will run the job at the 10th day of each month at 08:00;
   schedule.scheduleJob(
     "remind users to confirm their email address",
-    "30 * * * * *",
-    // "0 8 10 * *",
+    "0 8 10 * *",
     () => {
       emailConfirmationRemainder();
     },

src/jobs/accountCleanup.js

@@ -1,3 +1,9 @@
+const fs = require('fs');
+const { sign } = require('jsonwebtoken');
+const path = require('path');
+const { mailer } = require('../helpers/mailer');
+
+
 const {
 	MAX_UNCONFIRMED_ACCOUNT_AGE,
 	EMAIL_CONFIRMATION_REMAINDER_TIMEOUT,
@@ -6,6 +12,7 @@ const {
 
 
 
+
 /**
  * @module Remove User Accounts With Unconfirmed Email Addresses
  * 
@@ -62,7 +69,7 @@ module.exports.emailConfirmationRemainder = async () => {
 
 	// find and retreive all the users with an unconfirmed email address
 
-	const accounts = await User.findAll(
+	let accounts = await User.findAll(
 		{
 			where:
 			{
@@ -76,22 +83,14 @@ module.exports.emailConfirmationRemainder = async () => {
 		return;
 	}
 
-	console.log("before the filter", accounts);
 	accounts = accounts.filter(account => Date.parse(account.createdAt) < Date.now() - EMAIL_CONFIRMATION_REMAINDER_TIMEOUT);
-	console.log("after the filter", accounts);
-
-	const accountInfo = accounts.map(account => { account.id, account.username, account.email });
-
-	console.log("after the map", accounts);
 
+	accounts.forEach((element) => {
 
-
-
-	accountInfo.forEach((element) => {
-
+		// generate a new token
 		const id_token = sign({ id: element.id }, process.env.EMAIL_TOKEN, { expiresIn: "10 days", });
 
-
+		// build-up the mail markup
 		let emailData = fs.readFileSync(path.join(process.cwd(), "/res/emails/confirmEmail.html"), 'ascii');
 
 		emailData = emailData.replace("${data.username}", element.username);