From bdb7d40548c58558ad03e176d9944f6929632f92 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 10 Jun 2015 15:22:57 -0700
Subject: [PATCH] fix usernames should be saved lowercased

---
 common/models/user.json | 1 -
 server/boot/user.js     | 9 +++------
 server/server.js        | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/models/user.json b/common/models/user.json
index 6733437349..076a74dd1e 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -29,7 +29,6 @@
     },
     "username": {
       "type": "string",
-      "sparse": true,
       "lowercase": true,
       "trim": true
     },
diff --git a/server/boot/user.js b/server/boot/user.js
index 5f57748f36..9597fa8ac6 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -21,7 +21,6 @@ module.exports = function(app) {
     res.redirect(301, '/signout');
   });
   router.get('/signin', getSignin);
-  // router.post('/signin', postSignin);
   router.get('/signout', signout);
   router.get('/forgot', getForgot);
   router.post('/forgot', postForgot);
@@ -29,7 +28,6 @@ module.exports = function(app) {
   router.post('/reset/:token', postReset);
   router.get('/email-signup', getEmailSignup);
   router.get('/email-signin', getEmailSignin);
-  // router.post('/email-signup', postEmailSignup);
   router.get('/account/api', getAccountAngular);
   router.post('/account/profile', postUpdateProfile);
   router.post('/account/password', postUpdatePassword);
@@ -121,15 +119,14 @@ module.exports = function(app) {
   */
 
   function returnUser (req, res, next) {
-    User.find(
-      {where: { 'username': req.params.username.toLowerCase() }},
+    User.findOne(
+      { where: { username: req.params.username.toLowerCase() } },
       function(err, user) {
         if (err) {
           debug('Username err: ', err);
           return next(err);
         }
-        if (user[0]) {
-          user = user[0];
+        if (user) {
           user.progressTimestamps =
             user.progressTimestamps.sort(function(a, b) {
               return a - b;
diff --git a/server/server.js b/server/server.js
index bc252012af..cce2ead0ac 100755
--- a/server/server.js
+++ b/server/server.js
@@ -212,7 +212,8 @@ var passportOptions = {
         emails[0].value :
         null;
 
-    var username = profile.username || profile.id;
+    var username = (profile.username || profile.id);
+    username = typeof username === 'string' ? username.toLowerCase() : username;
     var password = generateKey('password');
     var userObj = {
       username: username,