Update login to move logic to controllers

controllers/permissions-controller.js

@@ -0,0 +1,58 @@
+var society_controller = require("./society-controller.js");
+var bcrypt = require("bcrypt-nodejs");
+
+module.exports = {
+  user_can_auth: function (user, pass, complete) {
+    var user_controller = require("./user-controller.js");
+    user_controller.get_password(user, function (result) {
+      bcrypt.compare(pass, result, function (err, matched) {
+        complete(matched === true);
+      });
+    })
+  },
+
+  user_can_view_society: function (auth, complete) {
+    complete(true);
+  },
+
+  user_can_view_soc_events: function (auth, society, complete) {
+    var user_controller = require("./user-controller.js");
+    user_controller.get_user_from_auth(auth, function (username) {
+      if (!username) {
+        complete(false);
+        return;
+      }
+      society_controller.get_user_list(society, function (userlist) {
+        if (!userlist[0]) {
+          complete(false);
+          return;
+        }
+        complete((userlist.indexOf(username) !== -1));
+      });
+    });
+  },
+
+  user_can_manage_soc_events: function (auth, society, complete) {
+    var user_controller = require("./user-controller.js");
+    user_controller.get_user_from_auth(auth, function(username) {
+      if (!username) {
+        complete(false);
+        return;
+      }
+      society_controller.get_admin_list(society, function (adminlist) {
+        if (!adminlist[0]) {
+          complete(false);
+          return;
+        }
+        complete((adminlist.indexOf(username) !== -1));
+      });
+    });
+  },
+
+  user_can_manage_society: function (auth, society, complete) {
+    var user_controller = require("./user-controller.js");
+    user_can_manage_soc_events(auth, society, function (permission) {
+      complete(permission);
+    });
+  }
+}

controllers/user-controller.js

@@ -0,0 +1,58 @@
+var Redis = require("ioredis");
+var redis = new Redis();
+var auth_gen = require("./../utils/auth-keys.js");
+var permissions_controller = require("./permissions-controller.js");
+
+module.exports = {
+  get_password: function (user, complete) {
+    var user_key = "user:" + user;
+
+    redis.hget(user_key, "password", function (err, password) {
+      if (password) {
+        complete(password);
+      } else {
+        complete("");
+      }
+    });
+  },
+
+  get_user_from_auth: function (auth, complete) {
+    var auth_key = "auth-key:" + auth;
+
+    redis.get(auth_key, function (err, username) {
+      if (username) {
+        complete(username);
+      } else {
+        complete("");
+      }
+    });
+  },
+
+  authenticate: function (user, pass, complete) {
+    permissions_controller.user_can_auth(user, pass, function (success) {
+      var user_key = "user:" + user;
+
+      if (success) {
+        redis.hget(user_key, "auth-key", function (auth) {
+          var new_auth_key = auth_gen.generate(user);
+          if (auth) {
+            redis.del("auth-key:" + auth);
+          }
+          redis.set("auth-key:" + auth, new_auth_key);
+          redis.hset(user_key, "auth-key", new_auth_key);
+
+          complete({
+            "logged_in": 1,
+            "auth-key": new_auth_key,
+            "error": 0
+          });
+        });
+      } else {
+        complete({
+          "logged_in": 0,
+          "error": 1
+        });
+      }
+    });
+  }
+}

routes/user/login.js

@@ -1,7 +1,4 @@
-var Redis = require("ioredis");
-var redis = new Redis();
-var bcrypt = require('bcrypt-nodejs');
-var authgen = require("./../../utils/auth-keys.js");
+var user_controller = require("./../../controllers/user-controller.js");
 
 module.exports = {
   perform: function(a,b) {
@@ -12,38 +9,14 @@ module.exports = {
 var perform = function(req, res) {
   var username = req.body.user || req.query.user;
   var password = req.body.password || req.query.password;
-  var uquery   = 'user:' + username;
 
-  redis.hgetall(uquery).then(function (result) {
-    if (result.password && result !== undefined && result !== null) {
-      var user_object = result;
-      if (username && password) {
-        username = username.toLowerCase();
-        bcrypt.compare(password, user_object.password, function (err, matched) {
-          if (matched) {
-            var new_auth_key = authgen.generate(username);
-            var aquery = "auth-key:" + new_auth_key;
-            redis.set(aquery, username);
-            redis.hset(uquery, "auth-key", new_auth_key);
-            if (user_object["auth-key"]) {
-              redis.del("auth-key:" + user_object["auth-key"]);
-            }
-            res.send({"logged_in": 1,
-                     "auth-key": new_auth_key,
-                     "error": 0})
-          } else {
-            res.send({"logged_in": 0,
-                     "error": 2});
-          }
-        });
-      } else {
-        res.send({"logged_in": 0,
-                 "error": 3});
-      }
-    } else {
-      res.send({"logged_in": 0,
-               "error": 1});
-               return;
-    }
-  });
+  if (username && password) {
+    user_controller.authenticate(username, password, function (result) {
+      res.send(result);
+    });
+  } else {
+    res.send({"logged_in": 0,
+              "error": 2});
+  }
+
 };