move https redirection into its own middleware

Author: calvinl

config/index.js

@@ -43,7 +43,8 @@ module.exports = {
 
   serverResolvePaths: {
     api: 'server/api',
-    constants: 'common/js/constants'
+    constants: 'common/js/constants',
+    middleware: 'server/middleware'
   },
 
   // Isomorphic configuration

server/middleware/httpsRedirect.js

@@ -0,0 +1,12 @@
+import url from 'url';
+
+export default function ({ enabled = false }) {
+  return function(req, res, next) {
+    if (enabled && !req.secure) {
+      const secureUrl = url.resolve(`https://${req.headers.host}`, req.url);
+      return res.redirect(secureUrl);
+    }
+
+    return next();
+  };
+}

server/middleware/index.js

@@ -0,0 +1 @@
+export { default as httpsRedirect } from './httpsRedirect';

server/server.js

@@ -5,25 +5,16 @@ import compression from 'compression';
 import Api from './api';
 import cookieParser from 'cookie-parser';
 import ReactRenderer from './renderer';
+import { httpsRedirect } from 'middleware';
 
 const env = process.env.NODE_ENV || 'development';
-let app = new express();
+const app = new express();
 
 // Secure with helmet
 app.use(helmet());
 
-/* Ensures SSL in used in production. To use, uncomment the below.
-app.use(function (req, res, next) {
-  var sslUrl;
-
-  if (env === 'production' && req.headers['x-forwarded-proto'] !== 'https') {
-    sslUrl = [process.env.APPLICATION_BASE_URL, req.url].join('');
-    return res.redirect(sslUrl);
-  }
-
-  return next();
-});
-*/
+// Ensures SSL in used in production.
+app.use(httpsRedirect({ enabled: env === 'production' }));
 
 // parse cookies!
 app.use(cookieParser());
@@ -32,14 +23,18 @@ app.use(cookieParser());
 app.use(compression());
 
 // Add middleware to serve up all static files
-app.use('/assets',
+app.use(
+  '/assets',
   express.static(path.join(__dirname, '../' + process.env.PUBLIC_OUTPUT_PATH)),
   express.static(path.join(__dirname, '../common/images')),
   express.static(path.join(__dirname, '../common/fonts'))
 );
 
 // handle browsers requesting favicon
-app.use('/favicon.ico', express.static(path.join(__dirname, '../common/images/favicon/favicon.ico')));
+app.use(
+  '/favicon.ico',
+  express.static(path.join(__dirname, '../common/images/favicon/favicon.ico'))
+);
 
 // Mount the REST API
 app.use('/api', Api);