From 93a2d3d660df567edfda8b2acc1564f010b619ad Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Tue, 4 Aug 2015 18:30:27 -0500
Subject: [PATCH] Use constants for is_prod and base_url

---
 website/src/middleware.js | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/website/src/middleware.js b/website/src/middleware.js
index 5aab362dfb..329ec7aa61 100644
--- a/website/src/middleware.js
+++ b/website/src/middleware.js
@@ -14,8 +14,11 @@ var os = require('os');
 var moment = require('moment');
 var utils = require('./utils');
 
+var IS_PROD = nconf.get('NODE_ENV') === 'production';
+var BASE_URL = nconf.get("BASE_URL");
+
 module.exports.apiThrottle = function(app) {
-  if (nconf.get('NODE_ENV') !== 'production') return;
+  if (!IS_PROD) return;
   app.use(limiter({
     end:false,
     catagories:{
@@ -33,7 +36,7 @@ module.exports.apiThrottle = function(app) {
 }
 
 module.exports.domainMiddleware = function(server,mongoose) {
-  if (nconf.get('NODE_ENV')=='production') {
+  if (IS_PROD) {
     var mins = 3, // how often to run this check
       useAvg = false, // use average over 3 minutes, or simply the last minute's report
       url = 'https://api.newrelic.com/v2/applications/'+nconf.get('NEW_RELIC_APPLICATION_ID')+'/metrics/data.json?names[]=Apdex&values[]=score';
@@ -88,13 +91,11 @@ module.exports.errorHandler = function(err, req, res, next) {
 }
 
 function isHTTP(req) {
-  var baseUrl = nconf.get("BASE_URL");
-
   return (
     req.headers['x-forwarded-proto']              &&
     req.headers['x-forwarded-proto'] !== 'https'  &&
-    nconf.get('NODE_ENV') === 'production'        &&
-    baseUrl.indexOf('https') === 0
+    IS_PROD                                       &&
+    BASE_URL.indexOf('https') === 0
   );
 }
 
@@ -106,30 +107,26 @@ function isProxied(req) {
 }
 
 module.exports.forceSSL = function(req, res, next){
-  var baseUrl = nconf.get("BASE_URL");
-
   if(isHTTP(req) && !isProxied(req)) {
-    return res.redirect(baseUrl + req.url);
+    return res.redirect(BASE_URL + req.url);
   }
 
   next();
 }
 
 // Redirect to habitica for non-api urls
-// NOTE: Currently using a static 'habitica.com' string, rather than baseUrl,
-// to make rollback easy. Eventually, baseUrl should be migrated.
+// NOTE: Currently using a static 'habitica.com' string, rather than BASE_URL,
+// to make rollback easy. Eventually, BASE_URL should be migrated.
 
 function nonApiUrl(req) {
   return req.url.search(/\/api\//) === -1;
 }
 
 module.exports.forceHabitica = function(req, res, next) {
-  var baseUrl = nconf.get('BASE_URL');
-  var isProd = nconf.get('NODE_ENV') === 'production';
   var isHabitRPG = req.headers.host === 'habitrpg.com';
 
-  if(isProd && isHabitRPG && !isProxied(req) && nonApiUrl(req)) {
-    return res.redirect(baseUrl + req.url);
+  if(IS_PROD && isHabitRPG && !isProxied(req) && nonApiUrl(req)) {
+    return res.redirect('https://habitica.com' + req.url);
   }
   next();
 };
@@ -192,7 +189,7 @@ var getManifestFiles = function(page){
 
   var code = '';
 
-  if(nconf.get('NODE_ENV') === 'production'){
+  if(IS_PROD){
     code += '<link rel="stylesheet" type="text/css" href="' + getBuildUrl(page + '.css') + '">';
     code += '<script type="text/javascript" src="' + getBuildUrl(page + '.js') + '"></script>';
   }else{