Merge branch 'MLAB-183' into 'testing'

Mlab 183

See merge request !66

config/config.js

@@ -31,6 +31,9 @@ module.exports = {
       authPass: 'mailpass',
       tlsCiphers: 'SSLv3',
       from: 'mailfrom',
+    },
+    gitlab: {
+      token_readWriteProjects: 'token-goes-here'
     }
   },
   testing: {
@@ -65,6 +68,9 @@ module.exports = {
       authPass: 'mailpass',
       tlsCiphers: 'SSLv3',
       from: 'mailfrom',
+    },
+    gitlab: {
+      token_readWriteProjects: 'token-goes-here'
     }
   }
 }
\ No newline at end of file

package.json

@@ -39,8 +39,9 @@
     "nodemailer": "^6.3.1",
     "nodemon": "^2.0.1",
     "passport": "0.3.2",
-    "passport-saml": "^1.2.0",
-    "pug": "^2.0.4"
+    "passport-saml": "^1.4.2",
+    "pug": "^2.0.4",
+    "superagent": "^6.1.0"
   },
   "devDependencies": {},
   "engines": {

routes/methods.js

@@ -69,7 +69,7 @@ var methods = {
         })
     },
     getUserByEmail: function(email, callback) {
-        dbconn.user.query('SELECT verificationStatus, salutation, title, firstname, lastname, industry, organisation, speciality, m4lab_idp FROM user WHERE email = "' +email+'"', function (err, rows, fields) {
+        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;
             }
@@ -212,6 +212,25 @@ var methods = {
             })
             callback(err)
         })
+    },
+    /* ===== GitLab ===== */
+    getGitlabId: function(userId, callback){
+        let gitlabUserId
+        dbconn.user.query('SELECT gu.gitlab_userId FROM user_gitlab gu, user u WHERE u.id = "' +userId+'" and gu.user_id = u.id', function (err, rows) {
+            if (err) {
+                throw err
+            }
+            else if(rows[0]) {
+                gitlabUserId = rows[0].gitlab_userId
+            }
+            callback(gitlabUserId, err)
+        })
+    },
+    addGitlabUser: function(data, callback){
+        dbconn.user.query('INSERT INTO user_gitlab SET ?', data, function (err) {
+            if (err) throw err
+            callback(err)
+        })
     }
 };
 

routes/routes-account.js

@@ -10,6 +10,7 @@ const salt = 64; // salt length
 const async = require('async')
 const crypto = require('crypto')
 const mailer = require('./mailer')
+const superagent = require('superagent')
 
 module.exports = function (app, config, passport, i18n) {
 
@@ -180,6 +181,34 @@ module.exports = function (app, config, passport, i18n) {
       methods.getUserByEmail(req.user.email, function(data, err){
         if (!err) {
           if (data.verificationStatus == 1) {
+            // start =============== RS: MLAB-183
+            let userId = data.id
+            methods.getGitlabId(userId, function(data, err){
+              if (!err) {
+                if (data) {
+                  console.log("TODO: GitLab is already activated for this user. Allow project creation.")
+                }
+                else {
+                  superagent.get('https://transfer.hft-stuttgart.de/gitlab/api/v4/users?private_token='+config.gitlab.token_readWriteProjects+'&search='+req.user.email)
+                  .then(res => {
+                    if (res.body.length > 0) {
+                      let gitlabActivationData = {
+                        user_id: userId,
+                        gitlab_userId: res.body[0].id
+                      }
+                      methods.addGitlabUser(gitlabActivationData, function(err){})
+                    }
+                    else {
+                      console.log('TODO: Show gitlab activation button: transfer.hft-stuttgart.de/gitlab')
+                    }
+                  })
+                  .catch(err => {
+                      console.log(err.message)
+                  });
+                }
+              }
+            })
+            // end =============== RS: MLAB-183
             res.render(lang+'/account/services', {
               user: data
             });