Move register logic to controllers and update README.md to reflect new APIs

README.md

@@ -63,7 +63,8 @@ The server will then respond with a JSON object that looks something like this:
     "error": 0 // Error code, if an error occured. 0 indicates no error.
 }
 ```
-The value of the error code will be `1` if the username already exists.
+The value of the error code will be `1` if the username already exists, and `2`
+if the request was malformed.
 
 ### /user/auth/
 In order to log into an account, or essentially request a new authentication
@@ -84,9 +85,8 @@ existing authentication key for that account. Note that you do not need to use
     "error": 0 // Error code, if an error occured. 0 indicates no error.
 }
 ```
-The error codes are as follows, `1` indicates the username could not be found,
-`2` indicates that the password is invalid and `3` indicates that the login
-request was malformed.
+The error codes are as follows, `1` indicates the username or password was
+invalid and `2` indicates that the login request was malformed.
 
 ### /society/create/
 To create a new society, a `POST` request should be sent with the following

controllers/user-controller.js

@@ -28,6 +28,14 @@ module.exports = {
     });
   },
 
+  user_exists: function (user, complete) {
+    var user_key = "user:" + user;
+
+    redis.hgetall(user_key, function (err, result) {
+      complete(!!result.password);
+    });
+  },
+
   authenticate: function (user, pass, complete) {
     permissions_controller.user_can_auth(user, pass, function (success) {
       var user_key = "user:" + user;
@@ -54,5 +62,36 @@ module.exports = {
         });
       }
     });
+  },
+
+  register: function (user, pass, complete) {
+    var user_key = "user:" + user;
+    var auth_key = "";
+    var new_user = {};
+
+    this.user_exists(user, function (exists) {
+      if (exists) {
+        complete({
+          "registered": 0,
+          "error": 1
+        });
+      } else {
+        bcrypt.hash(pass, null, null, function (err, hash) {
+          new_user["password"] = hash;
+          new_user["auth-key"] = auth_gen.generate(user);
+          auth_key = "auth-key:" + new_user["auth-key"];
+
+          redis.hset(user_key, "password", new_user["password"]);
+          redis.hset(user_key, "auth-key", new_user["auth-key"]);
+          redis.set(auth_key, user);
+          complete({
+            "registered": 1,
+            "auth-key": new_user["auth-key"],
+            "error": 0
+          })
+        });
+      }
+    })
+
   }
 }

routes/user/login.js

@@ -11,6 +11,7 @@ var perform = function(req, res) {
   var password = req.body.password || req.query.password;
 
   if (username && password) {
+    username = username.toLowerCase();
     user_controller.authenticate(username, password, function (result) {
       res.send(result);
     });

routes/user/register.js

@@ -1,6 +1,4 @@
-var Redis = require("ioredis");
-var redis = new Redis();
-var authgen = require("./../../utils/auth-keys.js");
+var user_controller = require("./../../controllers/user-controller.js");
 
 module.exports = {
   perform: function(a,b) {
@@ -9,29 +7,18 @@ module.exports = {
 }
 
 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 aquery       = "";
-  var user_object  = {};
+  var username = req.body.user || req.query.user;
+  var password = req.body.password || req.query.password;
 
-  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"] = authgen.generate(tmp_username);
-        aquery = "auth-key:" + user_object["auth-key"];
-        redis.hset(uquery, "password", user_object.password);
-        redis.hset(uquery, "auth-key", user_object["auth-key"]);
-        redis.set(aquery, tmp_username);
-        res.send({"registered": 1,
-                 "auth-key": user_object["auth-key"],
-                 "error": 0});
-      });
-    }
-  });
+  if (username && password) {
+    username = username.toLowerCase();
+    user_controller.register(username, password, function (result) {
+      res.send(result);
+    })
+  } else {
+    res.send({
+      "registered": 0,
+      "error": 2
+    })
+  }
 };