Merge pull request #134 from dadi/feature/output-web-version

Feature/output web version

config.js

@@ -95,7 +95,7 @@ var conf = convict({
     enabled: {
       doc: 'Determines whether this web instance requires access to the API',
       format: Boolean,
-      default: true
+      default: false
     }
   },
   auth: {

config/config.development.json.sample

@@ -8,6 +8,7 @@
   },
   "cluster": false,
   "api": {
+    "enabled": false,
     "host": "127.0.0.1",
     "port": 3000
   },

config/config.https.json.sample

@@ -11,6 +11,7 @@
     "sslCertificatePath": "ssl/cert.pem"
   },
   "api": {
+    "enabled": false,
     "host": "127.0.0.1",
     "port": 3000
   },

config/config.production.json.sample

@@ -7,6 +7,7 @@
     "port": 3001
   },
   "api": {
+    "enabled": false,
     "host": "127.0.0.1",
     "port": 3000
   },

config/config.qa.json.sample

@@ -8,6 +8,7 @@
   },
   "cluster": false,
   "api": {
+    "enabled": false,
     "host": "127.0.0.1",
     "port": 3000
   },

config/config.test.json.sample

@@ -8,6 +8,7 @@
   },
   "cluster": false,
   "api": {
+    "enabled": false,
     "host": "127.0.0.1",
     "port": 3000
   },

dadi/lib/controller/index.js

@@ -193,6 +193,8 @@ Controller.prototype.process = function process (req, res, next) {
     help.timer.stop(req.method.toLowerCase())
     if (data) data.stats = help.timer.getStats()
 
+    if (data) data.version = help.getVersion()
+
     if (data.json) {
       return done(null, data)
     }

dadi/lib/help.js

@@ -9,12 +9,17 @@ var https = require('https')
 var path = require('path')
 var perfy = require('perfy')
 
+var version = require('../../package.json').version
 var cache = require(path.join(__dirname, '/cache'))
 var config = require(path.join(__dirname, '/../../config.js'))
 var Passport = require('@dadi/passport')
 
 var self = this
 
+module.exports.getVersion = function () {
+  if (config.get('debug')) return version
+}
+
 module.exports.htmlEncode = function (input) {
   var encodedStr = input.replace(/[\u00A0-\u9999<>&]/gim, function (i) {
     return '&#' + i.charCodeAt(0) + ';'

dadi/lib/index.js

@@ -752,7 +752,7 @@ function onListening (e) {
     if (config.get('api.enabled') === true) {
       startText += '  API:         '.green + extraPadding + config.get('api.host') + ':' + config.get('api.port') + '\n'
     } else {
-      startText += '  API:         '.green + extraPadding + 'Not found'.red + '\n'
+      startText += '  API:         '.green + extraPadding + 'Disabled'.red + '\n'
       startText += '  ----------------------------\n'
     }
 

test/acceptance/routing.js

@@ -50,6 +50,7 @@ describe('Routing', function (done) {
     //scope = nock(apiHost).post('/token').reply(200, { accessToken: 'xx' })
     var configUpdate = {
       server: {
+        enabled: true,
         host: '127.0.0.1',
         port: 5000
       }