rewrite: start adding facebook auth. note, this isn't going to work properly due to issues outlined in http://stackoverflow.com/questions/14572600/passport-js-restful-auth . gotta figure something out here...

src/controllers/user.js

@@ -18,44 +18,6 @@ var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var api = module.exports;
 
-/*
-  ------------------------------------------------------------------------
-  Misc
-  ------------------------------------------------------------------------
-*/
-
-var NO_TOKEN_OR_UID = { err: "You must include a token and uid (user id) in your request"};
-var NO_USER_FOUND = {err: "No user found."};
-
-/*
-  beforeEach auth interceptor
-*/
-
-api.auth = function(req, res, next) {
-  var token, uid;
-  uid = req.headers['x-api-user'];
-  token = req.headers['x-api-key'];
-  if (!(uid && token)) {
-    return res.json(401, NO_TOKEN_OR_UID);
-  }
-  return User.findOne({
-    _id: uid,
-    apiToken: token
-  }, function(err, user) {
-    if (err) {
-      return res.json(500, {
-        err: err
-      });
-    }
-    if (_.isEmpty(user)) {
-      return res.json(401, NO_USER_FOUND);
-    }
-    res.locals.wasModified = +user._v !== +req.query._v;
-    res.locals.user = user;
-    req.session.userId = user._id;
-    return next();
-  });
-};
 
 /*
   ------------------------------------------------------------------------
@@ -430,73 +392,6 @@ api.buy = function(req, res, next) {
   ------------------------------------------------------------------------
 */
 
-
-/*
-  Registers a new user. Only accepting username/password registrations, no Facebook
-*/
-
-
-api.registerUser = function(req, res, next) {
-  var confirmPassword, e, email, password, username, _ref;
-  _ref = req.body, email = _ref.email, username = _ref.username, password = _ref.password, confirmPassword = _ref.confirmPassword;
-  if (!(username && password && email)) {
-    return res.json(401, {
-      err: ":username, :email, :password, :confirmPassword required"
-    });
-  }
-  if (password !== confirmPassword) {
-    return res.json(401, {
-      err: ":password and :confirmPassword don't match"
-    });
-  }
-  try {
-    validator.check(email).isEmail();
-  } catch (_error) {
-    e = _error;
-    return res.json(401, {
-      err: e.message
-    });
-  }
-  return async.waterfall([
-    function(cb) {
-      return User.findOne({
-        'auth.local.email': email
-      }, cb);
-    }, function(found, cb) {
-      if (found) {
-        return cb("Email already taken");
-      }
-      return User.findOne({
-        'auth.local.username': username
-      }, cb);
-    }, function(found, cb) {
-      var newUser, salt, user;
-      if (found) {
-        return cb("Username already taken");
-      }
-      newUser = helpers.newUser(true);
-      salt = utils.makeSalt();
-      newUser.auth = {
-        local: {
-          username: username,
-          email: email,
-          salt: salt
-        }
-      };
-      newUser.auth.local.hashed_password = derbyAuthUtil.encryptPassword(password, salt);
-      user = new User(newUser);
-      return user.save(cb);
-    }
-  ], function(err, saved) {
-    if (err) {
-      return res.json(401, {
-        err: err
-      });
-    }
-    return res.json(200, saved);
-  });
-};
-
 /*
   Get User
 */
@@ -515,72 +410,6 @@ api.getUser = function(req, res, next) {
   return res.json(200, user);
 };
 
-/*
-  Register new user with uname / password
-*/
-
-
-api.loginLocal = function(req, res, next) {
-  var username = req.body.username;
-  var password = req.body.password;
-  async.waterfall([
-    function(cb) {
-      if (!(username && password)) return cb('No username or password');
-      User.findOne({'auth.local.username': username}, cb);
-    }, function(user, cb) {
-      if (!user) return cb('Username not found');
-      // We needed the whole user object first so we can get his salt to encrypt password comparison
-      User.findOne({
-        'auth.local.username': username,
-        'auth.local.hashed_password': utils.encryptPassword(password, user.auth.local.salt)
-      }, cb);
-    }
-  ], function(err, user) {
-    if (!user) err = 'Incorrect password';
-    if (err) return res.json(401, {err: err});
-    res.json(200, {
-      id: user._id,
-      token: user.apiToken
-    });
-  });
-};
-
-/*
-  POST /user/auth/facebook
-*/
-
-
-api.loginFacebook = function(req, res, next) {
-  var email, facebook_id, name, _ref;
-  _ref = req.body, facebook_id = _ref.facebook_id, email = _ref.email, name = _ref.name;
-  if (!facebook_id) {
-    return res.json(401, {
-      err: 'No facebook id provided'
-    });
-  }
-  return User.findOne({
-    'auth.local.facebook.id': facebook_id
-  }, function(err, user) {
-    if (err) {
-      return res.json(401, {
-        err: err
-      });
-    }
-    if (user) {
-      return res.json(200, {
-        id: user.id,
-        token: user.apiToken
-      });
-    } else {
-      /* FIXME: create a new user instead*/
-
-      return res.json(403, {
-        err: "Please register with Facebook on https://habitrpg.com, then come back here and log in."
-      });
-    }
-  });
-};
-
 /*
   Update user
   FIXME add documentation here