diff --git a/services/auth.service.js b/services/auth.service.js index c700bef..3027da7 100644 --- a/services/auth.service.js +++ b/services/auth.service.js @@ -67,8 +67,7 @@ class AuthService { if (!passwordMatch) throw new ErrorHandler(401, 'Invalid credentials'); if (!user.is_active) throw new ErrorHandler(403, 'User is inactive'); - if (!user.is_approve) - throw new ErrorHandler(403, 'Your account has not been approved by admin yet.'); + if (!user.is_approve) throw new ErrorHandler(403, 'Your account has not been approved by admin yet.'); const payload = { user_id: user.user_id, diff --git a/validate/user.schema.js b/validate/user.schema.js index 4b7d020..19b4be9 100644 --- a/validate/user.schema.js +++ b/validate/user.schema.js @@ -29,16 +29,15 @@ const userSchema = Joi.object({ }); const updateUserSchema = Joi.object({ - user_fullname: Joi.string().min(3).max(100), - user_name: Joi.string().alphanum().min(3).max(50), - user_email: Joi.string().email(), + user_fullname: Joi.string().min(3).max(100).optional(), + user_name: Joi.string().alphanum().min(3).max(50).optional(), + user_email: Joi.string().email().optional(), user_phone: Joi.string() .pattern(/^(?:\+62|0)8\d{7,10}$/) - .messages({ - 'string.pattern.base': - 'Phone number must be a valid Indonesian number in format +628XXXXXXXXX' - }), - role_id: Joi.number().integer().min(1) + .message('Phone number must be a valid Indonesian number in format +628XXXXXXXXX') + .optional(), + role_id: Joi.number().integer().min(1).optional(), + is_active: Joi.boolean().optional() }).min(1); const newPasswordSchema = Joi.object({