gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix usernames should be saved lowercased

Browse Source
This commit is contained in:
Berkeley Martinez
2015-06-10 15:22:57 -07:00
parent 996c3e7816
commit bdb7d40548
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/models/user.json
View File

@ -29,7 +29,6 @@
}, },
"username": { "username": {
"type": "string", "type": "string",
"sparse": true,
"lowercase": true, "lowercase": true,
"trim": true "trim": true
}, },

9
server/boot/user.js
View File

@ -21,7 +21,6 @@ module.exports = function(app) {
res.redirect(301, '/signout'); res.redirect(301, '/signout');
}); });
router.get('/signin', getSignin); router.get('/signin', getSignin);
// router.post('/signin', postSignin);
router.get('/signout', signout); router.get('/signout', signout);
router.get('/forgot', getForgot); router.get('/forgot', getForgot);
router.post('/forgot', postForgot); router.post('/forgot', postForgot);
@ -29,7 +28,6 @@ module.exports = function(app) {
router.post('/reset/:token', postReset); router.post('/reset/:token', postReset);
router.get('/email-signup', getEmailSignup); router.get('/email-signup', getEmailSignup);
router.get('/email-signin', getEmailSignin); router.get('/email-signin', getEmailSignin);
// router.post('/email-signup', postEmailSignup);
router.get('/account/api', getAccountAngular); router.get('/account/api', getAccountAngular);
router.post('/account/profile', postUpdateProfile); router.post('/account/profile', postUpdateProfile);
router.post('/account/password', postUpdatePassword); router.post('/account/password', postUpdatePassword);
@ -121,15 +119,14 @@ module.exports = function(app) {
*/ */
function returnUser (req, res, next) { function returnUser (req, res, next) {
User.find( User.findOne(
{where: { 'username': req.params.username.toLowerCase() }}, { where: { username: req.params.username.toLowerCase() } },
function(err, user) { function(err, user) {
if (err) { if (err) {
debug('Username err: ', err); debug('Username err: ', err);
return next(err); return next(err);
} }
if (user[0]) { if (user) {
user = user[0];
user.progressTimestamps = user.progressTimestamps =
user.progressTimestamps.sort(function(a, b) { user.progressTimestamps.sort(function(a, b) {
return a - b; return a - b;

3
server/server.js
View File

@ -212,7 +212,8 @@ var passportOptions = {
emails[0].value : emails[0].value :
null; 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 password = generateKey('password');
var userObj = { var userObj = {
username: username, username: username,