support adding custom services per-project

5 files changed, 32 insertions, 32 deletions

diff --git a/app/index.js b/app/index.js
index 1a8f97e..7fd88f4 100644
--- a/app/index.js
+++ b/app/index.js
@@ -94,19 +94,30 @@ function OKCMS(options) {
           errorHandler);
 
   // Create services
-  if (serviceConfig.s3) {
-    var s3Service = OKS3Service({
-      express: express,
-      s3: serviceConfig.s3,
-    });
-  }
-
-  if (serviceConfig.twitter) {
-    var twitterService = OKTwitterService({
-      express: express,
-      credentials: serviceConfig.twitter,
-    })
-  }
+  var services = {}
+  Object.keys(serviceConfig).forEach(function(key){
+    var config = serviceConfig[key]
+    switch (key) {
+      case 's3':
+        services.s3 = OKS3Service({
+          express: express,
+          s3: config,
+        });
+        break
+      case 'twitter':
+        services.twitter = OKTwitterService({
+          express: express,
+          credentials: config,
+        });
+        break
+      default:
+        services[key] = config.lib({
+          express: express,
+          config: config,
+        });
+        break
+    }
+  });
 
   var server = this._server = new OKServer({
     express: express,
@@ -117,10 +128,7 @@ function OKCMS(options) {
     root: root,
     adminRoot: adminRoot,
     adminPath: adminPath,
-    services: {
-      s3: s3Service,
-      twitter: twitterService,
-    },
+    services: services,
     errorHandler: errorHandler
   });
 }
diff --git a/app/node_modules/okserver/index.js b/app/node_modules/okserver/index.js
index 302911d..a89676f 100644
--- a/app/node_modules/okserver/index.js
+++ b/app/node_modules/okserver/index.js
@@ -52,7 +52,7 @@ function OKServer(options) {
    * other middleware.
    */
 
-  // Disable silly express header
+  // Disable x-powered-by express header
   app.disable('x-powered-by')
   // Serve user static files
   app.use(express.static(root));
@@ -61,12 +61,9 @@ function OKServer(options) {
   // Application router
   app.use(router);
   // Add services
-  if (services.s3) {
-    app.use('/_services/s3', services.s3.middleware());
-  }
-  if (services.twitter) {
-    app.use('/_services/twitter', services.twitter.middleware())
-  }
+  Object.keys(services).forEach(function(key){
+    app.use('/_services/' + key, services[key].middleware());
+  })
   // Make sure this lady is last. Checks whether the desired
   // route has a trailing-slash counterpart and redirects there
   app.use(slash());
diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index c636308..cc40b71 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -20,9 +20,6 @@ function OKS3(options) {
   if (!options.s3.audio) options.s3.audio = {}
   if (!options.s3.video) options.s3.video = {}
 
-  // TODO: maxBytes property doesn't work - if you upload a large file,
-  // it will just hang until you reload the browser, and then CRASH.
-  
   // Make sure maxbytes property is there - it can be a number,
   // or zero/undefined (for no maximum upload size)
   if (options.s3.maxbytes) {
diff --git a/package.json b/package.json
index 2a927d5..bd5719b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okcms",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "great",
   "main": "app/index.js",
   "scripts": {
@@ -13,7 +13,8 @@
     "dotenv": "^1.1.0",
     "express": "^4.12.3",
     "object-assign": "^2.0.0",
-    "q": "^1.2.0"
+    "q": "^1.2.0",
+    "request": "^2.71.0"
   },
   "devDependencies": {
     "grunt": "^0.4.5",
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index da23b1b..6ff7ac9 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -177,9 +177,6 @@ OKUpload.prototype.add = function(media){
 OKUpload.prototype.addMedia = function(media){
   console.log(media)
 }
-OKUpload.prototype.addAudio = function(media){
-  console.log(media)
-}
 OKUpload.prototype.error = function(error){
   throw error
 }