Add client side new config

DemocracyOS · Apr 21, 2015 · 66e0601 · 66e0601
1 parent 83e8298
commit 66e0601
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 73 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,4 +17,4 @@ WORKDIR /usr/src/democracyos/app
 # If you change the port, remember to set the proper ENV var to match.
 EXPOSE 80
 
-CMD node ./bin/dos-config && node index.js
+CMD node index.js
diff --git a/bin/dos-config b/bin/dos-config
diff --git a/config/defaults.json b/config/defaults.json
@@ -1,45 +1,63 @@
 {
+  "locale" : "en",
   "protocol": "http",
   "host": "localhost",
-  "privatePort": 3000,
   "publicPort": 3000,
+  "privatePort": 3000,
   "mongoUrl": "mongodb://localhost/DemocracyOS-dev",
+  "mongoUsersUrl": "",
+  "secret": "Generate a secret token and paste it here.",
+  "deploymentId": "",
+  "deploymentDomain": "",
   "corsDomains": "",
   "signinUrl": "",
   "signupUrl": "",
   "settingsUrl": "",
+  "staff": [],
+  "auth": {
+    "basic": {
+      "username": "",
+      "password": ""
+    }
+  },
+  "ssl": {
+    "serverKey": "server.key",
+    "serverCert": "server.crt",
+    "port": 443,
+    "redirect": "normal"
+  },
+  "notifications": {
+    "url": "http://localhost:9001/api/events",
+    "token": 1234
+  },
   "client": [
     "protocol",
     "host",
     "publicPort",
     "env",
+    "locale",
     "logo",
+    "logoMobile",
     "favicon",
     "organizationName",
     "organizationUrl",
     "learnMoreUrl",
     "googleAnalyticsTrackingId",
     "commentsPerPage",
     "faq",
-    "tos",
     "pp",
+    "tos",
     "glossary",
     "signinUrl",
     "signupUrl",
     "settingsUrl",
     "clientDebug",
     "homeLink",
-    "logoMobile",
     "usersWhitelist",
+    "deploymentDomain",
     "headerBackgroundColor",
     "headerFontColor"
   ],
-  "auth": {
-    "basic": {
-      "username": "",
-      "password": ""
-    }
-  },
   "socialshare" : {
     "siteName" : "DemocracyOS",
     "siteDescription" : "DemocracyOS voting system",
@@ -49,16 +67,12 @@
       "username" : "@democracyos"
     }
   },
-  "locale" : "en",
   "logo": "/lib/boot/images/logo.png",
   "logoMobile": "/lib/boot/images/logo.png",
   "favicon" : " /lib/boot/images/favicon.ico",
   "organizationName" : "DemocracyOS on GitHub",
   "organizationUrl" : "https://github.com/DemocracyOS/app",
   "learnMoreUrl": "http://www.democracyos.org",
-  "headerBackgroundColor": "",
-  "headerFontColor": "",
-  "staff": [],
   "googleAnalyticsTrackingId" : "",
   "rssEnabled" : true,
   "commentsPerPage": 0,
@@ -67,20 +81,10 @@
   "tos": false,
   "pp": false,
   "glossary": false,
-  "notifications": {
-    "url": "http://localhost:9001/api/events",
-    "token": 1234
-  },
-  "secret": "Just a sample secret string",
-  "ssl": {
-    "serverKey": "server.key",
-    "serverCert": "server.crt",
-    "port": 443,
-    "redirect": "normal"
-  },
-  "clientDebug": "",
-  "googleAPIKey": "",
   "homeLink": "/",
+  "clientDebug": "",
   "usersWhitelist": false,
-  "deploymentDomain": "localhost"
+  "headerBackgroundColor": "",
+  "headerFontColor": "",
+  "googleAPIKey": ""
 }
diff --git a/lib/config/client.js b/lib/config/client.js
@@ -0,0 +1,12 @@
+var config = require('lib/config');
+var client = {};
+
+config.client.forEach(function(key){
+  if (!config.hasOwnProperty(key)) {
+    throw new Error('Config key "' + key + '" non existent.');
+  }
+
+  client[key] = config[key];
+});
+
+module.exports = client;
diff --git a/lib/config/component.json b/lib/config/component.json
@@ -0,0 +1,8 @@
+{
+  "name": "config",
+  "description": "Client config component",
+  "dependencies": {},
+  "locals": [],
+  "scripts": [ "config.js" ],
+  "main": "config.js"
+}
diff --git a/lib/config/config.js b/lib/config/config.js
@@ -0,0 +1 @@
+module.exports = window.config;
diff --git a/lib/config/index.js b/lib/config/index.js
@@ -21,6 +21,7 @@
 var log = require('debug')('democracyos:config');
 var resolve = require('path').resolve;
 var path = require('path');
+var fs = require('fs');
 var typeOf = require('component-type');
 var changeCase = require('change-case');
 var cast = require('./cast-string');
@@ -60,7 +61,7 @@ function parse(val, key, scope){
   }
 
   var local = get(localConfig, s);
-  if (local.hasOwnProperty(key)) {
+  if (local && local.hasOwnProperty(key)) {
     var newVal = local[key];
     if (typeOf(val) !== typeOf(newVal)) {
       throw new Error('Invalid value for key "' + key + '" on "' + environment + '.json": ' + '". Should be "' + typeOf(val) + '".');
@@ -73,7 +74,7 @@ function parse(val, key, scope){
 
 function get(obj, scope) {
   var c = obj;
-  if (scope) scope.forEach(function(k){ c = c[k] });
+  if (scope) scope.forEach(function(k){ c = c ? c[k] : null; });
   return c;
 }
 
@@ -87,4 +88,12 @@ function forEach(obj, cb) {
   });
 }
 
+config.env = environment;
+
+if (!config.secret || config.secret === defaultConfig.secret) {
+  var crypto = require('crypto');
+  var token = crypto.randomBytes(32).toString('hex');
+  throw new Error('Must set a unique token for your app on the "secret" key of the configuration.\n\nHere\'s one just for you: "' + token + '".\n');
+}
+
 module.exports = config;
diff --git a/lib/debug/index.js b/lib/debug/index.js
@@ -9,14 +9,12 @@ var debug = require('debug');
  * Initialize debug
  */
 
-if (config.clientDebug && true === config.clientDebug) {
-  debug.disable();
+debug.disable();
+
+if (config.clientDebug === '*') {
   debug.enable('democracyos:*');
-} else if (config.clientDebug && 'string' === typeof config.clientDebug) {
-  debug.disable();
+} else if (config.clientDebug) {
   debug.enable(config.clientDebug);
-} else {
-  debug.disable();
 }
 
 module.exports = debug;
diff --git a/lib/law-api/index.js b/lib/law-api/index.js
@@ -399,8 +399,8 @@ app.post('/law/:id/publish', restrict, staff, function (req, res) {
           instance: instanceUrl
         };
 
-        if (config('deployment id')) {
-          data.deploymentId = config('deployment id');
+        if (config.deploymentId) {
+          data.deploymentId = config.deploymentId;
         }
 
         notifier.notify(eventName)

diff --git a/lib/layout/index.js b/lib/layout/index.js
@@ -3,16 +3,11 @@
  */
 
 var config = require('lib/config');
+var clientConfig = require('lib/config/client');
 var path = require('path');
 var resolve = path.resolve;
 var html = resolve(__dirname, 'index.jade');
 
 module.exports = function (req, res) {
-  var client = {};
-
-  config.client.forEach(function(k) {
-    client[k] = config[k];
-  });
-
-  res.render(html, { config: config, client: client });
+  res.render(html, { config: config, client: clientConfig });
 };
diff --git a/package.json b/package.json
@@ -107,6 +107,6 @@
     "node": "0.10.x"
   },
   "scripts": {
-    "postinstall": "node ./bin/dos-install && node ./bin/dos-config && node ./bin/dos-build"
+    "postinstall": "node ./bin/dos-install && node ./bin/dos-build"
   }
 }