Merge pull request #275 from Unleash/cookie_session

Cookie session

lib/app.js

@@ -4,20 +4,18 @@ const express = require('express');
 const favicon = require('serve-favicon');
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
-const validator = require('express-validator');
-const responseTime = require('response-time');
-const logger = require('./logger')('app.js');
 const routes = require('./routes');
 const path = require('path');
 const errorHandler = require('errorhandler');
-
+const unleashSession = require('./middleware/session');
-const { REQUEST_TIME } = require('./events');
+const responseTime = require('./middleware/response-time');
+const requestLogger = require('./middleware/request-logger');
+const validator = require('./middleware/validator');
 
 module.exports = function(config) {
     const app = express();
 
     const baseUriPath = config.baseUriPath || '';
-    const publicFolder = config.publicFolder;
 
     app.set('trust proxy');
     app.disable('x-powered-by');
@@ -29,42 +27,15 @@ module.exports = function(config) {
     }
 
     app.use(cookieParser());
-
-    if (publicFolder) {
-        app.use(favicon(path.join(publicFolder, 'favicon.ico')));
-    }
-
-    app.use(
-        responseTime((req, res, time) => {
-            const timingInfo = {
-                path: req.baseUrl,
-                method: req.method,
-                statusCode: res.statusCode,
-                time,
-            };
-            config.eventBus.emit(REQUEST_TIME, timingInfo);
-        })
-    );
-
-    app.use(
-        validator({
-            customValidators: {
-                isUrlFirendlyName: input => encodeURIComponent(input) === input,
-            },
-        })
-    );
-
-    if (publicFolder) {
-        app.use(baseUriPath, express.static(publicFolder));
-    }
-
     app.use(bodyParser.json({ strict: false }));
+    app.use(unleashSession(config));
+    app.use(responseTime(config));
+    app.use(requestLogger(config));
+    app.use(validator(config));
 
-    if (config.enableRequestLogger) {
+    if (config.publicFolder) {
-        app.use((req, res, next) => {
+        app.use(favicon(path.join(config.publicFolder, 'favicon.ico')));
-            next();
+        app.use(baseUriPath, express.static(config.publicFolder));
-            logger.info(`${res.statusCode} ${req.method} ${req.baseUrl}`);
-        });
     }
 
     if (typeof config.preRouterHook === 'function') {

lib/middleware/request-logger.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const logger = require('../logger')('HTTP');
+
+module.exports = function(config) {
+    return (req, res, next) => {
+        next();
+        if (config.enableRequestLogger) {
+            logger.info(`${res.statusCode} ${req.method} ${req.baseUrl}`);
+        }
+    };
+};

lib/middleware/response-time.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const responseTime = require('response-time');
+const { REQUEST_TIME } = require('../events');
+
+module.exports = function(config) {
+    return responseTime((req, res, time) => {
+        const timingInfo = {
+            path: req.baseUrl,
+            method: req.method,
+            statusCode: res.statusCode,
+            time,
+        };
+        config.eventBus.emit(REQUEST_TIME, timingInfo);
+    });
+};

lib/middleware/session.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const cookieSession = require('cookie-session');
+
+module.exports = function(config) {
+    return cookieSession({
+        name: 'unleash-session',
+        keys: [config.secret],
+        maxAge: config.sessionAge,
+    });
+};

lib/middleware/validator.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const validator = require('express-validator');
+
+module.exports = function() {
+    return validator({
+        customValidators: {
+            isUrlFriendlyName: input => encodeURIComponent(input) === input,
+        },
+    });
+};

lib/options.js

@@ -3,6 +3,7 @@
 const { publicFolder } = require('unleash-frontend');
 
 const isDev = () => process.env.NODE_ENV === 'development';
+const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
 
 const DEFAULT_OPTIONS = {
     databaseUrl: process.env.DATABASE_URL,
@@ -12,6 +13,8 @@ const DEFAULT_OPTIONS = {
     enableLegacyRoutes: true,
     publicFolder,
     enableRequestLogger: isDev(),
+    secret: 'UNLEASH-SECRET',
+    sessionAge: THIRTY_DAYS,
 };
 
 module.exports = {

lib/routes/admin-api/feature.js

@@ -108,7 +108,7 @@ module.exports.router = function(config) {
 
     router.post('/validate', (req, res) => {
         req.checkBody('name', 'Name is required').notEmpty();
-        req.checkBody('name', 'Name must be URL friendly').isUrlFirendlyName();
+        req.checkBody('name', 'Name must be URL friendly').isUrlFriendlyName();
 
         validateRequest(req)
             .then(validateUniqueName)
@@ -118,7 +118,7 @@ module.exports.router = function(config) {
 
     router.post('/', (req, res) => {
         req.checkBody('name', 'Name is required').notEmpty();
-        req.checkBody('name', 'Name must be URL friendly').isUrlFirendlyName();
+        req.checkBody('name', 'Name must be URL friendly').isUrlFriendlyName();
 
         const userName = extractUser(req);
 

lib/routes/admin-api/index.js

@@ -24,9 +24,7 @@ exports.apiDef = apiDef;
 exports.router = config => {
     const router = Router();
 
-    router.get('/', (req, res) => {
+    router.get('/', (req, res) => res.json(apiDef));
-        res.json(apiDef);
-    });
 
     router.use('/features', features.router(config));
     router.use('/archive', featureArchive.router(config));

package.json

@@ -60,6 +60,7 @@
     "body-parser": "^1.18.2",
     "commander": "^2.9.0",
     "cookie-parser": "^1.4.3",
+    "cookie-session": "^2.0.0-beta.3",
     "db-migrate": "0.10.0-beta.24",
     "db-migrate-pg": "^0.2.4",
     "deep-diff": "^0.3.3",

yarn.lock

@@ -1189,6 +1189,15 @@ cookie-parser@^1.4.3:
     cookie "0.3.1"
     cookie-signature "1.0.6"
 
+cookie-session@^2.0.0-beta.3:
+  version "2.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0-beta.3.tgz#4e446bd9f85bd7e27d3e226f4e99af12011a4386"
+  dependencies:
+    cookies "0.7.1"
+    debug "3.1.0"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.1"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -1201,6 +1210,13 @@ cookiejar@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.1.tgz#41ad57b1b555951ec171412a81942b1e8200d34a"
 
+cookies@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.1.tgz#7c8a615f5481c61ab9f16c833731bcb8f663b99b"
+  dependencies:
+    depd "~1.1.1"
+    keygrip "~1.0.2"
+
 core-assert@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f"
@@ -3068,6 +3084,10 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+keygrip@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.2.tgz#ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"