From fce5a162d3b3d6fda100b1a7d2ab519ff4a31cc0 Mon Sep 17 00:00:00 2001
From: rui hildt <ruihildt@protonmail.com>
Date: Thu, 7 May 2020 15:10:15 +0200
Subject: [PATCH] Replace bcrypt with bcryptjs / move env to config

---
 api/server.js     | 10 +++++++++-
 config/config.js  |  6 ++++++
 data/db.js        |  4 ++--
 index.js          |  7 +++----
 knexfile.js       |  7 ++++---
 package-lock.json |  5 +++++
 package.json      |  1 +
 7 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 config/config.js

diff --git a/api/server.js b/api/server.js
index 9303efd..6db6818 100644
--- a/api/server.js
+++ b/api/server.js
@@ -1,7 +1,8 @@
+require('dotenv').config();
 const express = require('express');
+const bodyParser = require('body-parser');
 const cors = require('cors');
 const helmet = require('helmet');
-require('dotenv').config();
 
 const accountsRoute = require('./routes/accountRoute');
 const meetingsRoute = require('./routes/meetingRoute');
@@ -15,6 +16,13 @@ server.use(cors());
 server.use(express.json());
 server.use(helmet());
 
+server.use(bodyParser.json());
+server.use(
+	bodyParser.urlencoded({
+		extended: true,
+	}),
+);
+
 server.use('/api/accounts', accountsRoute);
 server.use('/api/meetings', meetingsRoute);
 server.use('/api/participants', participantsRoute);
diff --git a/config/config.js b/config/config.js
new file mode 100644
index 0000000..92a4ae8
--- /dev/null
+++ b/config/config.js
@@ -0,0 +1,6 @@
+module.exports = {
+	jwt_secret: process.env.JWT_SECRET,
+	port: process.env.PORT || 3001,
+	db_url: process.env.DATABASE_URL,
+	environment: process.env.NODE_ENV,
+};
diff --git a/data/db.js b/data/db.js
index 4c2ad05..2a593e2 100644
--- a/data/db.js
+++ b/data/db.js
@@ -1,8 +1,8 @@
 const knex = require('knex');
-
 const knexfile = require('../knexfile');
+const { environment} = require('../config/config')
 
-const env = process.env.NODE_ENV || 'development';
+const env = environment || 'development';
 const configOptions = knexfile[env];
 
 module.exports = knex(configOptions);
diff --git a/index.js b/index.js
index c2f8195..f051fc4 100644
--- a/index.js
+++ b/index.js
@@ -1,9 +1,8 @@
 const server = require('./api/server.js');
+const { port } = require('./config/config');
 
-const PORT = process.env.PORT || 3001;
-
-server.listen(PORT, () =>
+server.listen(port, () =>
 	console.log(
-		`Meeting Planner Backend listening at http://localhost:${PORT}`,
+		`Meeting Planner Backend listening at http://localhost:${port}`,
 	),
 );
diff --git a/knexfile.js b/knexfile.js
index b6968a4..62af910 100644
--- a/knexfile.js
+++ b/knexfile.js
@@ -1,9 +1,10 @@
 require('dotenv').config();
+const { db_url } = require('./config/config');
 
 module.exports = {
 	development: {
 		client: 'pg',
-		connection: process.env.DATABASE_URL,
+		connection: db_url,
 		migrations: {
 			directory: './data/migrations',
 		},
@@ -13,7 +14,7 @@ module.exports = {
 
 	testing: {
 		client: 'pg',
-		connection: process.env.DATABASE_URL,
+		connection: db_url,
 		migrations: {
 			directory: './data/migrations',
 		},
@@ -23,7 +24,7 @@ module.exports = {
 
 	production: {
 		client: 'pg',
-		connection: process.env.DATABASE_URL,
+		connection: db_url,
 		migrations: {
 			directory: './data/migrations',
 		},
diff --git a/package-lock.json b/package-lock.json
index 0a2e6d7..7f931e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -113,6 +113,11 @@
 				}
 			}
 		},
+		"bcryptjs": {
+			"version": "2.4.3",
+			"resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+			"integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
+		},
 		"bluebird": {
 			"version": "3.7.2",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
diff --git a/package.json b/package.json
index 1ca0ff2..f532f05 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
 	"author": "rui hildt",
 	"license": "AGPL-3.0-or-later",
 	"dependencies": {
+		"bcryptjs": "^2.4.3",
 		"cors": "^2.8.5",
 		"dotenv": "^8.2.0",
 		"express": "^4.17.1",