Move middleware under src/

installer/server.js

@@ -15,8 +15,11 @@ var announce = require('./announce.js'),
     https = require('https'),
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     installer = require('./installer.js'),
-    middleware = require('../middleware'),
+    json = require('body-parser').json,
+    lastMile = require('connect-lastmile'),
+    morgan = require('morgan'),
     path = require('path'),
+    proxy = require('proxy-middleware'),
     superagent = require('superagent');
 
 exports = module.exports = {
@@ -106,10 +109,10 @@ function startUpdateServer(callback) {
 
     var router = new express.Router();
 
-    app.use(middleware.json({ strict: true }))
-       .use(middleware.morgan({ format: 'dev', immediate: false }))
+    app.use(json({ strict: true }))
+       .use(morgan({ format: 'dev', immediate: false }))
        .use(router)
-       .use(middleware.lastMile());
+       .use(lastMile());
 
     router.post('/api/v1/installer/update', update);
 
@@ -128,10 +131,10 @@ function startProvisionServer(callback) {
 
     var router = new express.Router();
 
-    app.use(middleware.json({ strict: true }))
-       .use(middleware.morgan({ format: 'dev', immediate: false }))
+    app.use(json({ strict: true }))
+       .use(morgan({ format: 'dev', immediate: false }))
        .use(router)
-       .use(middleware.lastMile());
+       .use(lastMile());
 
     router.post('/api/v1/installer/provision', provision);
     router.post('/api/v1/installer/restore', restore);

src/routes/graphs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var middleware = require('../../middleware/index.js'),
+var middleware = require('../middleware/index.js'),
     url = require('url');
 
 exports = module.exports = {

src/routes/oauth2.js

@@ -12,7 +12,7 @@ var assert = require('assert'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     mailer = require('../mailer.js'),
-    middleware = require('../../middleware/index.js'),
+    middleware = require('../middleware/index.js'),
     oauth2orize = require('oauth2orize'),
     passport = require('passport'),
     session = require('connect-ensure-login'),

src/server.js

@@ -15,7 +15,7 @@ var apps = require('./apps'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     mailer = require('./mailer.js'),
-    middleware = require('../middleware'),
+    middleware = require('./middleware'),
     mkdirp = require('mkdirp'),
     passport = require('passport'),
     path = require('path'),