Merge branch 'MLAB-524' into 'testing'

Mlab 524

See merge request !38

app.js

@@ -30,7 +30,7 @@ app.use(session(
     {
         resave: true,
         saveUninitialized: true,
-        secret: 'thisisasecret-thisisasecret-thisisasecret'
+        secret: config.app.sessionSecret
     }
 ))
 app.use(passport.initialize())
@@ -55,7 +55,7 @@ app.use(function(req, res, next) {
     next()
 })
   
-require('./routes/routes-project')(app, config, passport)
+require('./routes/project')(app, config, passport)
   
 // Handle 404
 app.use(function (req, res, next) {

config/config.js

@@ -2,7 +2,8 @@ module.exports = {
   development: {
     app: {
       name: 'Project Page Manager',
-      port: process.env.PORT || 8888
+      port: process.env.PORT || 8888,
+      sessionSecret: 'thisisasecret-thisisasecret-thisisasecret'
     },
     passport: {
       strategy: 'saml',
@@ -37,7 +38,8 @@ module.exports = {
   testing: {
     app: {
       name: 'Project Page Manager',
-      port: process.env.PORT || 8888
+      port: process.env.PORT || 8888,
+      sessionSecret: 'thisisasecret-thisisasecret-thisisasecret'
     },
     passport: {
       strategy: 'saml',

routes/dbconn.js → config/dbconn.js

 const mysql = require('mysql')
 
 var env = process.env.NODE_ENV || 'testing';
-const config = require('../config/config')[env]
+const config = require('./config')[env]
 
 // ==== USER ACOOUNT DB CONNECTION ====
 var userConnection = mysql.createConnection({

routes/mailer.js → config/mailer.js

 const nodemailer = require('nodemailer')
 
 var env = process.env.NODE_ENV || 'testing';
-const config = require('../config/config')[env]
+const config = require('./config')[env]
 
 var smtpTransport = nodemailer.createTransport({
     host: config.mailer.host,

routes/methods.js → functions/methods.js

-const dbconn = require('./dbconn');
+const dbconn = require('../config/dbconn');
 
 var methods = {
     // test method

package.json

@@ -39,5 +39,8 @@
   "engines": {
     "node": ">= 4.0.0"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "nodemon": "^2.0.9"
+  }
 }

routes/routes-project.js → routes/project.js

 //const SamlStrategy = require('passport-saml').Strategy
-const methods = require('./methods')
-const gitlab = require('./gitlab')
+const methods = require('../functions/methods')
+const gitlab = require('../functions/gitlab')
 // pwd encryption
 //const bcrypt = require('bcryptjs');
 //const saltRounds = 10;
@@ -9,7 +9,7 @@ const gitlab = require('./gitlab')
 const async = require('async')
 //const crypto = require('crypto')
 //const mailer = require('./mailer')
-const helpers = require('./helpers')
+const helpers = require('../functions/helpers')
 const pictSizeLimit = 1000000 // 1 MB
 
 module.exports = function (app) {