Tidy up unique fields from user model

This has to be Bool: http://mongoosejs.com/docs/api.html#schematype_SchemaType-unique
Trustroots · Apr 16, 2015 · 7e31b8f · 7e31b8f
1 parent 2106e34
commit 7e31b8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/errors.server.controller.js b/app/controllers/errors.server.controller.js
@@ -2,6 +2,7 @@
 
 /**
  * Get unique error field name
+ * @todo: once https://github.com/Automattic/mongoose/issues/2284 gets done, we can have prettier errors for this.
  */
 var getUniqueErrorMessage = function(err) {
   var output;

diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js
@@ -64,7 +64,7 @@ var UserSchema = new Schema({
   email: {
     type: String,
     trim: true,
-    unique: 'Email already exists',
+    unique: true,
     lowercase: true,
     default: '',
     validate: [validateLocalStrategyProperty, 'Please enter your email'],
@@ -111,7 +111,7 @@ var UserSchema = new Schema({
   // Lowercase enforced username
   username: {
     type: String,
-    unique: 'Username already exists',
+    unique: true,
     required: 'Please fill in a username',
     validate: [validateUsername, 'Please fill in valid username: 3-32 characters long non banned word, characters "_-.", no consecutive dots, lowercase letters a-z and numbers 0-9.'],
     lowercase: true, // Stops users creating case sensitive duplicate usernames with "username" and "USERname", via @link https://github.com/meanjs/mean/issues/147