From 0491bc23e55e4fa3e337a4f8b87c28b921c6ee77 Mon Sep 17 00:00:00 2001
From: Julian Poyourow <julianpoyo@gmail.com>
Date: Wed, 8 Jun 2016 15:06:54 -0700
Subject: [PATCH 1/2] Separated the version config

---
 backend/config/constants.json | 16 ++++++++++++++++
 backend/routes/index.js       | 23 ++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/backend/config/constants.json b/backend/config/constants.json
index 3c2e463..049b7a4 100644
--- a/backend/config/constants.json
+++ b/backend/config/constants.json
@@ -24,5 +24,21 @@
       "SUBSCRIBE_PAGE": true,
       "SUBSCRIBE_ONLINE_TEXT": false
     }
+  },
+  "CLIENTVER": {
+    "0.1.9": {
+      "IOS": {
+        "SUBSCRIBE_PAGE": false,
+        "SUBSCRIBE_ONLINE_TEXT": false
+      },
+      "ANDROID": {
+        "SUBSCRIBE_PAGE": false,
+        "SUBSCRIBE_ONLINE_TEXT": false
+      },
+      "WEB": {
+        "SUBSCRIBE_PAGE": true,
+        "SUBSCRIBE_ONLINE_TEXT": false
+      }
+    },
   }
 }
diff --git a/backend/routes/index.js b/backend/routes/index.js
index 8a5e84f..dd37610 100644
--- a/backend/routes/index.js
+++ b/backend/routes/index.js
@@ -13,12 +13,29 @@ router.get('/prices', function(req, res, next) {
 });
 
 router.get('/client', function(req, res, next) {
+  var status = 200;
   //CLIENT OUT OF DATE - Semver client version is less than last compat
-  if(semver.lt(req.query.version, CONST.VERSION.LAST_COMPATIBLE)){ res.status(426).json(CONST.CLIENT) }
+  if(semver.lt(req.query.version, CONST.VERSION.LAST_COMPATIBLE)){
+    status = 426;
+  }
   //CLIENT BEING DEPRICATED SOON - Semver client version is less than or equal to DEPRICATED
-  else if(semver.lte(req.query.version, CONST.VERSION.DEPRICATED)){ res.status(449).json(CONST.CLIENT) }
+  else if(semver.lte(req.query.version, CONST.VERSION.DEPRICATED)){
+    status = 449;
+  }
   //CLIENT VERSION OK
-  else { res.status(200).json(CONST.CLIENT) }
+  else {
+    status = 200;
+  }
+  sendClient(req.query.version, status);
 });
 
+function sendClient(version, status){
+  var custClient = CONST.CLIENTVER.indexOf(version);
+  if(custClient > -1){
+    res.status(status).json(CONST.CLIENTVER[custClient]);
+  } else {
+    res.status(status).json(CONST.CLIENT);
+  }
+}
+
 module.exports = router;

From f0f5ad8b871a88678e7679403b3a28b2d00c7a02 Mon Sep 17 00:00:00 2001
From: Julian Poyourow <julianpoyo@gmail.com>
Date: Wed, 8 Jun 2016 17:57:50 -0700
Subject: [PATCH 2/2] Fixed some details with verion referencing

---
 backend/config/constants.json |  8 ++++----
 backend/routes/index.js       | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/config/constants.json b/backend/config/constants.json
index 049b7a4..a795927 100644
--- a/backend/config/constants.json
+++ b/backend/config/constants.json
@@ -13,11 +13,11 @@
   },
   "CLIENT": {
     "IOS": {
-      "SUBSCRIBE_PAGE": false,
+      "SUBSCRIBE_PAGE": true,
       "SUBSCRIBE_ONLINE_TEXT": false
     },
     "ANDROID": {
-      "SUBSCRIBE_PAGE": false,
+      "SUBSCRIBE_PAGE": true,
       "SUBSCRIBE_ONLINE_TEXT": false
     },
     "WEB": {
@@ -32,13 +32,13 @@
         "SUBSCRIBE_ONLINE_TEXT": false
       },
       "ANDROID": {
-        "SUBSCRIBE_PAGE": false,
+        "SUBSCRIBE_PAGE": true,
         "SUBSCRIBE_ONLINE_TEXT": false
       },
       "WEB": {
         "SUBSCRIBE_PAGE": true,
         "SUBSCRIBE_ONLINE_TEXT": false
       }
-    },
+    }
   }
 }
diff --git a/backend/routes/index.js b/backend/routes/index.js
index dd37610..2f84b7b 100644
--- a/backend/routes/index.js
+++ b/backend/routes/index.js
@@ -26,13 +26,13 @@ router.get('/client', function(req, res, next) {
   else {
     status = 200;
   }
-  sendClient(req.query.version, status);
+  sendClient(req.query.version, status, res);
 });
 
-function sendClient(version, status){
-  var custClient = CONST.CLIENTVER.indexOf(version);
-  if(custClient > -1){
-    res.status(status).json(CONST.CLIENTVER[custClient]);
+function sendClient(version, status, res){
+  var custClient = CONST.CLIENTVER[version];
+  if(custClient){
+    res.status(status).json(custClient);
   } else {
     res.status(status).json(CONST.CLIENT);
   }