wisdom #2

Merged
yogiedigital merged 126 commits from wisdom into main 2025-10-20 03:26:33 +00:00
2 changed files with 8 additions and 10 deletions
Showing only changes of commit 2907cb6347 - Show all commits

View File

@@ -67,8 +67,7 @@ class AuthService {
if (!passwordMatch) throw new ErrorHandler(401, 'Invalid credentials'); if (!passwordMatch) throw new ErrorHandler(401, 'Invalid credentials');
if (!user.is_active) throw new ErrorHandler(403, 'User is inactive'); if (!user.is_active) throw new ErrorHandler(403, 'User is inactive');
if (!user.is_approve) if (!user.is_approve) throw new ErrorHandler(403, 'Your account has not been approved by admin yet.');
throw new ErrorHandler(403, 'Your account has not been approved by admin yet.');
const payload = { const payload = {
user_id: user.user_id, user_id: user.user_id,

View File

@@ -29,16 +29,15 @@ const userSchema = Joi.object({
}); });
const updateUserSchema = Joi.object({ const updateUserSchema = Joi.object({
user_fullname: Joi.string().min(3).max(100), user_fullname: Joi.string().min(3).max(100).optional(),
user_name: Joi.string().alphanum().min(3).max(50), user_name: Joi.string().alphanum().min(3).max(50).optional(),
user_email: Joi.string().email(), user_email: Joi.string().email().optional(),
user_phone: Joi.string() user_phone: Joi.string()
.pattern(/^(?:\+62|0)8\d{7,10}$/) .pattern(/^(?:\+62|0)8\d{7,10}$/)
.messages({ .message('Phone number must be a valid Indonesian number in format +628XXXXXXXXX')
'string.pattern.base': .optional(),
'Phone number must be a valid Indonesian number in format +628XXXXXXXXX' role_id: Joi.number().integer().min(1).optional(),
}), is_active: Joi.boolean().optional()
role_id: Joi.number().integer().min(1)
}).min(1); }).min(1);
const newPasswordSchema = Joi.object({ const newPasswordSchema = Joi.object({