Big refactoring effort to use a route manager and separate files for each API route.

index.js

@@ -1,9 +1,7 @@
 var express = require('express');
 var https = require('https');
 var app = express();
-var bcrypt = require('bcrypt-nodejs');
-var Redis = require('ioredis');
-var redis = new Redis();
+var route_manager = require("./route-manager.js");
 var bodyParser = require('body-parser');
 var fs = require('fs');
 var prkey = fs.readFileSync('server.key');
@@ -11,90 +9,7 @@ var certi = fs.readFileSync('server.crt');
 
 app.use(bodyParser.json()); // for parsing application/json
 app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
-
-app.get('/hello/(:name)?', function (req, res) {
-  var name = req.params.name || "World";
-  res.send('<title>Hello ' + name + '!</title>' + 'Hello ' + name + "!");
-});
-
-app.all('/register', function (req, res) {
-  var tmp_username = req.body.user || req.query.user;
-  var tmp_password = req.body.password || req.query.password;
-  tmp_username = tmp_username.toLowerCase();
-  var uquery       = 'user:' + tmp_username;
-  var user_object  = {};
-
-  redis.hgetall(uquery).then(function (result) {
-    if (result.password && result !== undefined && result !== null) {
-      res.send({"registered": 0,
-               "error": 1});
-    } else {
-      bcrypt.hash(tmp_password, null, null, function (err, hash) {
-        user_object["password"] = hash;
-        user_object["auth-key"] = bcrypt.hashSync(Date.now().toString() + tmp_username);
-        redis.hset(uquery, "password", user_object.password);
-        redis.hset(uquery, "auth-key", user_object["auth-key"]);
-        res.send({"registered": 1,
-                 "auth-key": user_object["auth-key"],
-                 "error": 0});
-      });
-    }
-  });
-});
-
-app.all('/login', function(req, res) {
-  var username = req.body.user || req.query.user;
-  username = username.toLowerCase();
-  var password = req.body.password || req.query.password;
-  var auth_key = req.body.auth_key || req.query.auth_key;
-  var uquery   = 'user:' + username;
-
-  redis.hgetall(uquery).then(function (result) {
-    if (result.password && result !== undefined && result !== null) {
-      var user_object = result;
-      if (auth_key !== "" && auth_key !== undefined && auth_key !== null) {
-        if (auth_key === user_object["auth-key"]) {
-          var timestamp_user = Date.now().toString() + username;
-          user_object["auth-key"] = bcrypt.hashSync(timestamp_user);
-          redis.set(uquery, "auth-key", user_object["auth-key"]);
-          res.send({"logged_in": 1,
-                   "auth-key": user_object["auth-key"],
-                   "error": 0});
-        } else {
-          res.send({"logged_in": 0,
-                   "error": 3});
-        }
-      } else {
-        bcrypt.compare(password, user_object["password"], function (err, matched) {
-          if (matched === true) {
-            if (undefined === user_object["auth-key"]) {
-              var timestamp_user = Date.now().toString() + username;
-              user_object["auth-key"] = bcrypt.hashSync(timestamp_user);
-              redis.set(uquery, JSON.stringify(user_object));
-              res.send({"logged_in": 1,
-                       "auth-key": user_object["auth-key"],
-                       "error": 0});
-            } else {
-              res.send({"logged_in": 1,
-                       "auth-key": user_object["auth-key"],
-                       "error": 0});
-            }
-            return;
-          } else {
-            res.send({"logged_in": 0,
-                     "error": 2});
-                     return;
-          }
-        });
-
-      }
-    } else {
-      res.send({"logged_in": 0,
-               "error": 1});
-               return;
-    }
-  });
-});
+app.use('/', route_manager);
 
 // app.listen(3000, function () {
 //     console.log('Example app listening on port 3000!');

route-manager.js

@@ -0,0 +1,13 @@
+var express = require("express");
+var router = express.Router();
+var hello = require("./routes/helloworld.js");
+var register = require("./routes/register.js");
+var login = require("./routes/login.js");
+
+module.exports = router;
+
+router.get('/hello/(:name)?', hello.perform);
+
+router.all('/register', register.perform);
+
+router.all('/login', login.perform);

routes/helloworld.js

@@ -0,0 +1,10 @@
+module.exports = {
+  perform: function (a, b) {
+    perform(a,b);
+  }
+}
+
+var perform = function(req, res) {
+  var name = req.params.name || "World";
+  res.send('<title>Hello ' + name + '!</title>' + 'Hello ' + name + "!");
+}

routes/login.js

@@ -0,0 +1,63 @@
+var Redis = require("ioredis");
+var redis = new Redis();
+var bcrypt = require('bcrypt-nodejs');
+
+module.exports = {
+  perform: function(a,b) {
+    perform(a,b);
+  }
+}
+
+var perform = function(req, res) {
+  var username = req.body.user || req.query.user;
+  username = username.toLowerCase();
+  var password = req.body.password || req.query.password;
+  var auth_key = req.body.auth_key || req.query.auth_key;
+  var uquery   = 'user:' + username;
+
+  redis.hgetall(uquery).then(function (result) {
+    if (result.password && result !== undefined && result !== null) {
+      var user_object = result;
+      if (auth_key !== "" && auth_key !== undefined && auth_key !== null) {
+        if (auth_key === user_object["auth-key"]) {
+          var timestamp_user = Date.now().toString() + username;
+          user_object["auth-key"] = bcrypt.hashSync(timestamp_user);
+          redis.set(uquery, "auth-key", user_object["auth-key"]);
+          res.send({"logged_in": 1,
+                   "auth-key": user_object["auth-key"],
+                   "error": 0});
+        } else {
+          res.send({"logged_in": 0,
+                   "error": 3});
+        }
+      } else {
+        bcrypt.compare(password, user_object["password"], function (err, matched) {
+          if (matched === true) {
+            if (undefined === user_object["auth-key"]) {
+              var timestamp_user = Date.now().toString() + username;
+              user_object["auth-key"] = bcrypt.hashSync(timestamp_user);
+              redis.set(uquery, JSON.stringify(user_object));
+              res.send({"logged_in": 1,
+                       "auth-key": user_object["auth-key"],
+                       "error": 0});
+            } else {
+              res.send({"logged_in": 1,
+                       "auth-key": user_object["auth-key"],
+                       "error": 0});
+            }
+            return;
+          } else {
+            res.send({"logged_in": 0,
+                     "error": 2});
+                     return;
+          }
+        });
+
+      }
+    } else {
+      res.send({"logged_in": 0,
+               "error": 1});
+               return;
+    }
+  });
+};

routes/register.js

@@ -0,0 +1,34 @@
+var Redis = require("ioredis");
+var redis = new Redis();
+var bcrypt = require('bcrypt-nodejs');
+
+module.exports = {
+  perform: function(a,b) {
+    perform(a,b);
+  }
+}
+
+var perform = function (req, res) {
+  var tmp_username = req.body.user || req.query.user;
+  var tmp_password = req.body.password || req.query.password;
+  tmp_username = tmp_username.toLowerCase();
+  var uquery       = 'user:' + tmp_username;
+  var user_object  = {};
+
+  redis.hgetall(uquery).then(function (result) {
+    if (result.password && result !== undefined && result !== null) {
+      res.send({"registered": 0,
+               "error": 1});
+    } else {
+      bcrypt.hash(tmp_password, null, null, function (err, hash) {
+        user_object["password"] = hash;
+        user_object["auth-key"] = bcrypt.hashSync(Date.now().toString() + tmp_username);
+        redis.hset(uquery, "password", user_object.password);
+        redis.hset(uquery, "auth-key", user_object["auth-key"]);
+        res.send({"registered": 1,
+                 "auth-key": user_object["auth-key"],
+                 "error": 0});
+      });
+    }
+  });
+};