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

Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
terakilobyte
2015-06-12 21:10:18 -04:00
parent af75452db5 f6fbe6e9c7
commit cf47e5374f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/models/user.js
View File

@ -11,10 +11,14 @@ module.exports = function(User) {
// set salt factor for passwords // set salt factor for passwords
User.settings.saltWorkFactor = 5; User.settings.saltWorkFactor = 5;
//User.validatesExclusionOf('username', { // username should not be in blacklist
// inArray: blacklistedUsernames, User.validatesExclusionOf('username', {
// message: 'username is taken' 'in': blacklistedUsernames,
//}); message: 'is taken'
});
// username should be unique
User.validatesUniquenessOf('username');
debug('setting up user hooks'); debug('setting up user hooks');
// send verification email to new camper // send verification email to new camper

3
common/models/user.json
View File

@ -44,7 +44,8 @@
"username": { "username": {
"type": "string", "type": "string",
"lowercase": true, "lowercase": true,
"trim": true "trim": true,
"require": true
}, },
"bio": { "bio": {
"type": "string", "type": "string",