Move wares to ctx

Author: sulkaharo

lib/api/index.js

@@ -1,11 +1,13 @@
 'use strict';
 
-function create (env, ctx, wares) {
+function create (env, ctx) {
   var _each = require('lodash/each')
     , express = require('express')
     ,  app = express( )
     ;
 
+  const wares = ctx.wares;
+
   // set up express app with our options
   app.set('name', env.name);
   app.set('version', env.version);

lib/api/notifications-v2.js

@@ -2,17 +2,17 @@
 
 var consts = require('../constants');
 
-function configure (app, ctx, wares) {
+function configure (app, ctx) {
   var express = require('express')
     , api = express.Router( )
     ;
 
-  api.use(wares.compression());
-  api.use(wares.rawParser);
-  api.use(wares.bodyParser.json({
+  api.use(ctx.wares.compression());
+  api.use(ctx.wares.rawParser);
+  api.use(ctx.wares.bodyParser.json({
       limit: '50Mb'
   }));
-  api.use(wares.urlencodedParser);
+  api.use(ctx.wares.urlencodedParser);
 
   api.post('/loop', ctx.authorization.isPermitted('notifications:loop:push'), function (req, res) {
     ctx.loop.sendNotification(req.body, req.connection.remoteAddress, function (error) {

lib/server/app.js

@@ -183,11 +183,10 @@ function create (env, ctx) {
   // api and json object variables
   ///////////////////////////////////////////////////
   const apiRoot = require('../api/root')(env, ctx);
-  var wares = require('../middleware/')(env);
-  var api = require('../api/')(env, ctx, wares);
+  var api = require('../api/')(env, ctx);
   var api3 = require('../api3/')(env, ctx);
   var ddata = require('../data/endpoints')(env, ctx);
-  var notificationsV2 = require('../api/notifications-v2')(app, ctx, wares);
+  var notificationsV2 = require('../api/notifications-v2')(app, ctx);
 
   app.use(compression({
     filter: function shouldCompress (req, res) {

lib/server/bootevent.js

@@ -208,6 +208,8 @@ function boot (env, language) {
       , levels: ctx.levels
     }).registerServerDefaults();
 
+    ctx.wares = require('../middleware/')(env);
+
     ctx.pushover = require('../plugins/pushover')(env, ctx);
     ctx.maker = require('../plugins/maker')(env);
     ctx.pushnotify = require('./pushnotify')(env, ctx);