Merge branch 'MLAB-56' into 'master'

Mlab 56

See merge request !2

routes/dbconn.js

@@ -18,7 +18,7 @@ userConnection.connect(function(err) {
 })
 userConnection.query('USE '+config.database.dbUser)
     
-// db connection test
+// user db connection test
 userConnection.query('SELECT 1 + 5 AS solution', function (err, rows, fields) {
     if (err) throw err
     console.log('Solution = ', rows[0].solution)
@@ -51,7 +51,7 @@ var dbconn = function dbconn(query, values, next) {
 
 // ==== PROJECT DB CONNECTION ====
 var projectConnection = mysql.createConnection({
-    host: config.database.host,
+    host: config.database.host_project,
     user: config.database.user,
     password: config.database.password,
     port: config.database.port,

routes/helpers.js

+var helpers = {
+    stringToArray: function (input){
+        if(input != null){
+            return input.split(',');
+        }else{
+            return null;
+        }
+    }
+};
+
+module.exports = helpers;
\ No newline at end of file

routes/mailer.js

+const nodemailer = require('nodemailer')
+
+var env = process.env.NODE_ENV || 'development';
+const config = require('../config/config')[env]
+
+var smtpTransport = nodemailer.createTransport({
+    host: config.mailer.host,
+    secureConnection: config.mailer.secureConnection,
+    port: config.mailer.port,
+    auth: {
+      user: config.mailer.authUser,
+      pass: config.mailer.authPass
+    },
+    tls: {
+        ciphers: config.mailer.tlsCiphers
+    } 
+});
+  
+var mailOptions = {
+    to: "",
+    from: config.mailer.from,
+    subject: "",
+    text: ""
+};
+
+var mailer = {
+    transport: smtpTransport,
+    options: mailOptions
+}
+
+module.exports = mailer
\ No newline at end of file

routes/methods.js

@@ -57,7 +57,7 @@ var methods = {
         })
     },
     getUserByEmail: function(email, callback) {
-        dbconn.user.query('SELECT title, firstname, lastname, industry, organisation, speciality FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
+        dbconn.user.query('SELECT salutation, title, firstname, lastname, industry, organisation, speciality FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
             if (err) {
                 throw err;
             }
@@ -83,19 +83,22 @@ var methods = {
             callback(err, user);
         });
     },
-    checkUserToken: function(token, callback) {
+    getUserByToken: function(token, callback) {
         var user;
-        dbconn.user.query('SELECT user_id FROM credential WHERE resetPasswordToken = "'+token+'" and resetPasswordExpires > '+Date.now(), function (err, rows, fields) {
+        dbconn.user.query('SELECT t1.user_id, t2.email FROM userdb.credential AS t1 INNER JOIN userdb.user AS t2 ON t1.user_id = t2.id AND t1.resetPasswordToken = "'
+            +token+'" and resetPasswordExpires > '+Date.now(), function (err, rows, fields) {
                 if (err) {
                     throw err;
                 }
                 else {
                     if ( rows.length > 0) {
-                    user = rows[0];
+                        user = rows[0]
+                        console.log(user)
                     }
                 }
                 callback(err, user);
-        });
+            }
+        );
     },
 	updateUser: function(userData, callback) {
 		dbconn.user.query('UPDATE user SET ? WHERE email = "' +userData.email+'"', userData, function (err, rows, fields) {
@@ -129,12 +132,44 @@ var methods = {
             callback(rows, err);
         });
     },
+    addUserProjectRole: function(data, callback) {
+        dbconn.user.query('INSERT INTO user_project_role SET ?', data, function (err, results, fields){
+            if (err) throw err;
+            callback(err);
+        })
+    },
     // ======================= project db =======================
     getAllProjects: function(callback) {
         dbconn.project.query('CALL getAllprojects', function (err, rows, fields){
             if (err) throw err;
             callback(rows[0], err);
         })
+    },
+    getAllMailinglists: function(callback) {
+        dbconn.project.query('CALL getAllLists', function (err, rows, fields){
+            if (err) throw err;
+            callback(rows[0], err);
+	    })
+    },
+    getProjectOverviewById: function(projectId, callback) {
+        dbconn.project.query('CALL GetProjectInformationByProjectID(' + projectId+ ')', function (err, rows, fields){
+            if (err) throw err;
+            callback(rows[0], err);
+    	})
+    },
+    getProjectImagesById: function(projectId, callback) {
+        dbconn.project.query('CALL getImagesByProjectID(' + projectId+ ')', function (err, rows, fields){
+            if (err) throw err;
+            callback(rows[0], err);
+        })
+    },
+    addProjectOverview: function(data, callback) {
+        dbconn.project.query('INSERT INTO project_overview SET ?', data, function (err, results, fields){
+            if (err) {
+                console.error(err);
+            }
+            callback(results, err);
+        })
     }
 };