From 2b4832a4f7de24a19c34cb5b2effdc89ca6dffca Mon Sep 17 00:00:00 2001
From: rui hildt <ruihildt@protonmail.com>
Date: Sat, 29 Aug 2020 10:48:21 +0200
Subject: [PATCH] Update config variables and add nodemailer's ones

---
 config/config.js            | 10 ++++++++--
 helpers/generateToken.js    |  4 ++--
 knexfile.js                 |  8 ++++----
 middlewares/authenticate.js |  4 ++--
 package-lock.json           |  5 +++++
 package.json                |  1 +
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/config/config.js b/config/config.js
index 5219fe2..f17d2b9 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,7 +1,13 @@
 module.exports = {
-	jwt_secret: process.env.JWT_SECRET,
+	// from '.env' in root folder
 	port: process.env.PORT || 3001,
-	db_url: process.env.DATABASE_URL,
 	environment: process.env.NODE_ENV || 'development',
+	dbURL: process.env.DATABASE_URL,
+	jwtSecret: process.env.JWT_SECRET,
+	smtpHost: process.env.SMTP_HOST,
+	smtpPort: process.env.SMTP_PORT,
+	smtpUsername: process.env.SMTP_USERNAME,
+	smtpPassword: process.env.SMTP_PASSWORD,
+	// Others
 	saltingRounds: process.env.SALTING_ROUNDS || 10,
 };
diff --git a/helpers/generateToken.js b/helpers/generateToken.js
index 8745adc..5576912 100644
--- a/helpers/generateToken.js
+++ b/helpers/generateToken.js
@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken');
-const { jwt_secret } = require('../config/config');
+const { jwtSecret } = require('../config/config');
 
 function generateToken(user) {
 	const payload = {
@@ -11,7 +11,7 @@ function generateToken(user) {
 		expiresIn: '30d',
 	};
 
-	return jwt.sign(payload, jwt_secret, options);
+	return jwt.sign(payload, jwtSecret, options);
 }
 
 exports.generateToken = generateToken;
diff --git a/knexfile.js b/knexfile.js
index 62af910..1e926b1 100644
--- a/knexfile.js
+++ b/knexfile.js
@@ -1,10 +1,10 @@
 require('dotenv').config();
-const { db_url } = require('./config/config');
+const { dbURL } = require('./config/config');
 
 module.exports = {
 	development: {
 		client: 'pg',
-		connection: db_url,
+		connection: dbURL,
 		migrations: {
 			directory: './data/migrations',
 		},
@@ -14,7 +14,7 @@ module.exports = {
 
 	testing: {
 		client: 'pg',
-		connection: db_url,
+		connection: dbURL,
 		migrations: {
 			directory: './data/migrations',
 		},
@@ -24,7 +24,7 @@ module.exports = {
 
 	production: {
 		client: 'pg',
-		connection: db_url,
+		connection: dbURL,
 		migrations: {
 			directory: './data/migrations',
 		},
diff --git a/middlewares/authenticate.js b/middlewares/authenticate.js
index 9cd4f4e..86c044c 100644
--- a/middlewares/authenticate.js
+++ b/middlewares/authenticate.js
@@ -1,11 +1,11 @@
 const jwt = require('jsonwebtoken');
-const { jwt_secret } = require('../config/config');
+const { jwtSecret } = require('../config/config');
 
 function authenticate(req, res, next) {
 	const token = req.get('Authorization');
 
 	if (token) {
-		jwt.verify(token, jwt_secret, (err, decoded) => {
+		jwt.verify(token, jwtSecret, (err, decoded) => {
 			if (err) return res.status(401).json(err);
 			req.decoded = decoded;
 			next();
diff --git a/package-lock.json b/package-lock.json
index 58af810..f0ba0d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1428,6 +1428,11 @@
 			"resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
 			"integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
 		},
+		"nodemailer": {
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz",
+			"integrity": "sha512-BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ=="
+		},
 		"normalize-package-data": {
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
diff --git a/package.json b/package.json
index 0deeaf8..370285c 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 		"helmet": "^3.22.0",
 		"jsonwebtoken": "^8.5.1",
 		"knex": "^0.21.1",
+		"nodemailer": "^6.4.11",
 		"pg": "^8.0.3",
 		"pgtools": "^0.3.0",
 		"uuid": "^8.0.0"