From fb31df83c311d903e6cebe123da61de22907565a Mon Sep 17 00:00:00 2001 From: Pierre Brisorgueil Date: Tue, 5 May 2020 11:26:31 +0200 Subject: [PATCH] =?UTF-8?q?feat(user):=20add=20bio=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(user): fix optionnal 🐛 --- config/defaults/development.js | 6 +++--- modules/users/models/user.model.mongoose.js | 1 + modules/users/models/user.schema.js | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/defaults/development.js b/config/defaults/development.js index ab4ceb382..7ffb82c11 100644 --- a/config/defaults/development.js +++ b/config/defaults/development.js @@ -83,9 +83,9 @@ module.exports = { }, whitelists: { users: { - default: ['_id', 'id', 'firstName', 'lastName', 'displayName', 'email', 'roles', 'avatar', 'provider', 'updatedAt', 'createdAt', 'resetPasswordToken', 'resetPasswordExpires'], - update: ['firstName', 'lastName', 'email', 'avatar'], - updateAdmin: ['firstName', 'lastName', 'email', 'avatar', 'roles'], + default: ['_id', 'id', 'firstName', 'lastName', 'bio', 'email', 'avatar', 'roles', 'provider', 'updatedAt', 'createdAt', 'resetPasswordToken', 'resetPasswordExpires'], + update: ['firstName', 'lastName', 'bio', 'email', 'avatar'], + updateAdmin: ['firstName', 'lastName', 'bio', 'email', 'avatar', 'roles'], recover: ['password', 'resetPasswordToken', 'resetPasswordExpires'], roles: ['user', 'admin'], }, diff --git a/modules/users/models/user.model.mongoose.js b/modules/users/models/user.model.mongoose.js index 9137e5de8..55e8f4aa5 100644 --- a/modules/users/models/user.model.mongoose.js +++ b/modules/users/models/user.model.mongoose.js @@ -13,6 +13,7 @@ const UserMongoose = new Schema({ sub: String, firstName: String, lastName: String, + bio: String, email: { type: String, unique: 'Email already exists', diff --git a/modules/users/models/user.schema.js b/modules/users/models/user.schema.js index 0cdbf2b65..46e19bf24 100644 --- a/modules/users/models/user.schema.js +++ b/modules/users/models/user.schema.js @@ -19,6 +19,10 @@ const UserSchema = Joi.object().keys({ lastName: Joi.string().alphanum().min(1).max(30) .trim() .required(), + bio: Joi.string().alphanum().min(1).max(200) + .trim() + .default('') + .optional(), email: Joi.string().email({ minDomainAtoms: 2 }), avatar: Joi.string().trim().default(''), roles: Joi.array().items(Joi.string().valid(config.whitelists.users.roles)).min(1).default(['user']),