Przeglądaj źródła

Use better error messages

sbkwgh 7 lat temu
rodzic
commit
282196b394
3 zmienionych plików z 6 dodań i 3 usunięć
  1. 1 1
      lib/errors.js
  2. 4 1
      models/user.js
  3. 1 1
      test/user.js

+ 1 - 1
lib/errors.js

@@ -4,7 +4,7 @@ let Errors = {
 	categoryAlreadyExists: ['This category has already been created', 400],
 	accountDoesNotExist: ['This account does not exist', 400],
 	invalidCategory: ['This category does not exist', 400],
-	invalidLoginCredentials: ['Invalid login credentials were provided', 401],
+	invalidLoginCredentials: ['The username or password provided was incorrect', 401],
 	requestNotAuthorized: ['The request was not authorized', 401],
 	invalidToken: ['The token provided was not valid', 401],
 	noSettings: ['You haven\'t added any settings yet', 500],

+ 4 - 1
models/user.js

@@ -8,7 +8,10 @@ module.exports = (sequelize, DataTypes) => {
 	let User = sequelize.define('User', {
 		username: {
 			type: DataTypes.STRING(191),
-			unique: true,
+			unique: {
+				msg: 'username already taken - try another',
+				fields: ['username']
+			},
 			validate: {
 				len: {
 					args: [6, 50],

+ 1 - 1
test/user.js

@@ -167,7 +167,7 @@ describe('User', () => {
 					res.should.have.status(400)
 					res.should.be.json
 					res.body.should.have.property('errors')
-					res.body.errors.should.contain.something.that.has.property('message', 'username must be unique')
+					res.body.errors.should.contain.something.that.has.property('message', 'username already taken - try another')
 					
 					done()
 				})