minor updates

app.js

@@ -67,11 +67,9 @@ app.use(function(req, res, next) {
 });
 
 require('./routes/routes-account')(app, config, passport, i18n);
-require('./routes/api')(app, config, passport);
 
 // Handle 404
 app.use(function (req, res, next) {
-  //res.status(404).send('404: Page not Found', 404)
   res.status(404).render('./DE/404')
 })
 

routes/dbconn.js

@@ -18,13 +18,6 @@ userConnection.connect(function(err) {
 })
 userConnection.query('USE '+config.database.dbUser)
 
-// 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)
-})
-//userConnection.end()
-
 // ALTERNATIVE approach: close db connection manually after every query
 /*
 var dbconn = function dbconn(query, values, next) {
@@ -63,13 +56,6 @@ projectConnection.connect(function(err) {
 })
 projectConnection.query('USE '+config.database.dbProject)
 
-// projectdb connection test
-projectConnection.query('SELECT 10 + 5 AS project', function (err, rows, fields) {
-    if (err) throw err
-    console.log('Project = ', rows[0].project)
-})
-//projectConnection.end()
-
 var connection = {
     user: userConnection,
     project: projectConnection

routes/methods.js

 const dbconn = require('./dbconn');
 
 var methods = {
-    // test method
-	currentDate: function() {
-		console.log('Current Date is: ' + new Date().toISOString().slice(0, 10));
-    },
     // ===================== user db =====================
     registerNewUser: function(data, callback) {
         dbconn.user.beginTransaction(function(err) { // START TRANSACTION
@@ -70,22 +66,20 @@ var methods = {
     },
     getUserByEmail: function(email, callback) {
         dbconn.user.query('SELECT id, verificationStatus, salutation, title, firstname, lastname, industry, organisation, speciality, m4lab_idp FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
-            if (err) {
-                throw err;
-            }
+            let user
+            if (err) { throw err }
             else {
                 if ( rows.length > 0) {
-                    user = rows[0];
+                    user = rows[0]
                 }
             }
-            callback(user, err);
+            callback(user, err)
         });
     },
     getUserById: function(userId, callback) {
         dbconn.user.query('SELECT verificationStatus, email, salutation, title, firstname, lastname, industry, organisation, speciality FROM user WHERE id = ' +userId, function (err, rows, fields) {
-            if (err) {
-                throw err;
-            }
+            let user
+            if (err) { throw err }
             else {
                 if ( rows.length > 0) {
                     user = rows[0];
@@ -96,34 +90,29 @@ var methods = {
     },
 	checkUserEmail: function(email, callback) {
         let user
-        dbconn.user.query('SELECT id, email FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
-            if (err) {
-                throw err;
-            }
+        dbconn.user.query('SELECT id, email FROM user WHERE email = "' +email+'"', function (err, rows) {
+            if (err) { throw err }
             else {
                 if ( rows.length > 0) {
                     user = rows[0];
                 }
             }
-            callback(err, user);
+            callback(err, user)
         });
     },
     getUserByToken: function(token, callback) {
         let user
         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;
-                }
+                if (err) { throw err }
                 else {
                     if ( rows.length > 0) {
                         user = rows[0]
-                        console.log(user)
                     }
                 }
-                callback(err, user);
+                callback(err, user)
             }
-        );
+        )
     },
 	updateUserById: function(userData, callback) {
 		dbconn.user.query('UPDATE user SET ? WHERE id = ' +userData.id, userData, function (err, rows, fields) {