Setup Wizard - Git check

agent.js

@@ -183,7 +183,6 @@ db.onReady.then(() => {
     timeZone: 'UTC',
     runOnInit: true
   })
-
 })
 
 // ----------------------------------------

client/js/configure.js

@@ -205,8 +205,9 @@ jQuery(document).ready(function ($) {
         let self = this
         this.state = 'gitcheck'
         this.loading = true
-        self.dbcheck = {
+        self.gitcheck = {
           ok: false,
+          results: [],
           error: ''
         }
 
@@ -214,6 +215,7 @@ jQuery(document).ready(function ($) {
           axios.post('/gitcheck', self.conf).then(resp => {
             if (resp.data.ok === true) {
               self.gitcheck.ok = true
+              self.gitcheck.results = resp.data.results
             } else {
               self.gitcheck.ok = false
               self.gitcheck.error = resp.data.error

configure.js

@@ -15,11 +15,10 @@ module.exports = (port, spinner) => {
   const http = require('http')
   const path = require('path')
   const Promise = require('bluebird')
-  const fs = require('fs-extra')
+  const fs = Promise.promisifyAll(require('fs-extra'))
   const yaml = require('js-yaml')
   const _ = require('lodash')
 
-
   // ----------------------------------------
   // Define Express App
   // ----------------------------------------
@@ -160,26 +159,76 @@ module.exports = (port, spinner) => {
    */
   app.post('/gitcheck', (req, res) => {
     const exec = require('execa')
+    const url = require('url')
 
     const dataDir = path.resolve(ROOTPATH, req.body.pathData)
     const gitDir = path.resolve(ROOTPATH, req.body.pathRepo)
-    let results = []
 
-    fs.ensureDir(dataDir).then(() => {
-      results.push('Data directory path is valid.')
-      return fs.ensureDir(gitDir).then(() => {
-        results.push('Git directory path is valid.')
-        return true
-      })
-    }).then(() => {
-      return exec.stdout('git', ['init'], { cwd: gitDir }).then(result => {
-        results.push('Git local repository initialized.')
-        return true
-      })
-    }).then(() => {
-      return res.json({ ok: true, results })
+    let urlObj = url.parse(req.body.gitUrl)
+    if (req.body.gitAuthType === 'basic') {
+      urlObj.auth = req.body.gitAuthUser + ':' + req.body.gitAuthPass
+    }
+    const gitRemoteUrl = url.format(urlObj)
+
+    Promise.mapSeries([
+      () => {
+        return fs.ensureDirAsync(dataDir).return('Data directory path is valid.')
+      },
+      () => {
+        return fs.ensureDirAsync(gitDir).return('Git directory path is valid.')
+      },
+      () => {
+        return exec.stdout('git', ['init'], { cwd: gitDir }).then(result => {
+          return 'Local git repository has been initialized.'
+        })
+      },
+      () => {
+        return exec.stdout('git', ['config', '--local', 'user.name', req.body.gitSignatureName], { cwd: gitDir }).then(result => {
+          return 'Git Signature Name has been set successfully.'
+        })
+      },
+      () => {
+        return exec.stdout('git', ['config', '--local', 'user.email', req.body.gitSignatureEmail], { cwd: gitDir }).then(result => {
+          return 'Git Signature Name has been set successfully.'
+        })
+      },
+      () => {
+        return exec.stdout('git', ['config', '--local', '--bool', 'http.sslVerify', req.body.gitAuthSSL], { cwd: gitDir }).then(result => {
+          return 'Git SSL Verify flag has been set successfully.'
+        })
+      },
+      () => {
+        if (req.body.gitAuthType === 'ssh') {
+          return exec.stdout('git', ['config', '--local', 'core.sshCommand', 'ssh -i "' + req.body.gitAuthSSHKey + '" -o StrictHostKeyChecking=no'], { cwd: gitDir }).then(result => {
+            return 'Git SSH Private Key path has been set successfully.'
+          })
+        } else {
+          return false
+        }
+      },
+      () => {
+        return exec.stdout('git', ['remote', 'remove', 'origin'], { cwd: gitDir }).catch(err => {
+          if (_.includes(err.message, 'No such remote')) {
+            return true
+          } else {
+            throw err
+          }
+        }).then(() => {
+          return exec.stdout('git', ['remote', 'add', 'origin', gitRemoteUrl], { cwd: gitDir }).then(result => {
+            return 'Git Remote was added successfully.'
+          })
+        })
+      },
+      () => {
+        return exec.stdout('git', ['pull', 'origin', req.body.gitBranch], { cwd: gitDir }).then(result => {
+          return 'Git Pull operation successful.'
+        })
+      }
+    ], step => { return step() }).then(results => {
+      return res.json({ ok: true, results: _.without(results, false) })
     }).catch(err => {
-      res.json({ ok: false, error: err.message })
+      let errMsg = (err.stderr) ? err.stderr.replace(/(error:|warning:|fatal:)/gi, '').replace(/ \s+/g, ' ') : err.message
+      res.json({ ok: false, error: errMsg })
     })
   })
 

views/configure/index.pug

@@ -252,17 +252,17 @@ html
                     .column(v-show='conf.gitAuthType === "basic"')
                       p.control.is-fullwidth
                         label.label Username
-                        input(type='text', v-model='conf.gitUrl')
+                        input(type='text', v-model='conf.gitAuthUser')
                         span.desc The username for the remote git connection.
                     .column(v-show='conf.gitAuthType === "basic"')
                       p.control.is-fullwidth
                         label.label Password
-                        input(type='password', v-model='conf.gitUrl')
+                        input(type='password', v-model='conf.gitAuthPass')
                         span.desc The password for the remote git connection.
                     .column(v-show='conf.gitAuthType === "ssh"')
                       p.control.is-fullwidth
                         label.label Private Key location
-                        input(type='text', placeholder='e.g. /etc/wiki/keys/git.pem')
+                        input(type='text', placeholder='e.g. /etc/wiki/keys/git.pem', v-model='conf.gitAuthSSHKey')
                         span.desc The full path to the private key on disk.
                   section.columns
                     .column
@@ -277,7 +277,7 @@ html
                         span.desc The email to use when pushing commits to the git repository.
                 .panel-footer
                   .progress-bar: div(v-bind:style='{width: currentProgress}')
-                  button.button.is-indigo.is-outlined(v-on:click='proceedToDb', v-bind:disabled='loading') Back
+                  button.button.is-indigo.is-outlined(v-on:click='proceedToPaths', v-bind:disabled='loading') Back
                   button.button.is-indigo.is-outlined(v-on:click='proceedToAdmin', v-bind:disabled='loading') Skip this step
                   button.button.is-indigo(v-on:click='proceedToGitCheck', v-bind:disabled='loading || errors.any("git")') Continue