From 483fc83a302cf686eb9946d897dfc119c5ed58b6 Mon Sep 17 00:00:00 2001 From: Bassel Kanso Date: Wed, 2 Oct 2024 12:03:28 +0300 Subject: [PATCH] fix: refactoring validation methods --- .../users-permissions/server/controllers/auth.js | 12 +++++++----- .../server/controllers/validation/auth.js | 15 +++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/plugins/users-permissions/server/controllers/auth.js b/packages/plugins/users-permissions/server/controllers/auth.js index 1548bbb630..515b4c577a 100644 --- a/packages/plugins/users-permissions/server/controllers/auth.js +++ b/packages/plugins/users-permissions/server/controllers/auth.js @@ -116,8 +116,9 @@ module.exports = ({ strapi }) => ({ const validations = strapi.config.get('plugin::users-permissions.validationRules'); - const { currentPassword, password } = await validateChangePasswordBody(validations)( - ctx.request.body + const { currentPassword, password } = await validateChangePasswordBody( + ctx.request.body, + validations ); const user = await strapi.db @@ -145,8 +146,9 @@ module.exports = ({ strapi }) => ({ async resetPassword(ctx) { const validations = strapi.config.get('plugin::users-permissions.validationRules'); - const { password, passwordConfirmation, code } = await validateResetPasswordBody(validations)( - ctx.request.body + const { password, passwordConfirmation, code } = await validateResetPasswordBody( + ctx.request.body, + validations ); if (password !== passwordConfirmation) { @@ -323,7 +325,7 @@ module.exports = ({ strapi }) => ({ const validations = strapi.config.get('plugin::users-permissions.validationRules'); - await validateRegisterBody(validations)(params); + await validateRegisterBody(params, validations); const role = await strapi.db .query('plugin::users-permissions.role') diff --git a/packages/plugins/users-permissions/server/controllers/validation/auth.js b/packages/plugins/users-permissions/server/controllers/validation/auth.js index 8c21cf2a82..ed833b7ab4 100644 --- a/packages/plugins/users-permissions/server/controllers/validation/auth.js +++ b/packages/plugins/users-permissions/server/controllers/validation/auth.js @@ -7,7 +7,7 @@ const callbackSchema = yup.object({ password: yup.string().required(), }); -const registerSchema = (config) => +const createRegisterSchema = (config) => yup.object({ email: yup.string().email().required(), username: yup.string().required(), @@ -43,7 +43,7 @@ const forgotPasswordSchema = yup }) .noUnknown(); -const resetPasswordSchema = (config) => +const createResetPasswordSchema = (config) => yup .object({ password: yup @@ -72,7 +72,7 @@ const resetPasswordSchema = (config) => }) .noUnknown(); -const changePasswordSchema = (config) => +const createChangePasswordSchema = (config) => yup .object({ password: yup @@ -101,10 +101,13 @@ const changePasswordSchema = (config) => module.exports = { validateCallbackBody: validateYupSchema(callbackSchema), - validateRegisterBody: (config) => validateYupSchema(registerSchema(config)), + validateRegisterBody: (payload, config) => + validateYupSchema(createRegisterSchema(config))(payload), validateSendEmailConfirmationBody: validateYupSchema(sendEmailConfirmationSchema), validateEmailConfirmationBody: validateYupSchema(validateEmailConfirmationSchema), validateForgotPasswordBody: validateYupSchema(forgotPasswordSchema), - validateResetPasswordBody: (config) => validateYupSchema(resetPasswordSchema(config)), - validateChangePasswordBody: (config) => validateYupSchema(changePasswordSchema(config)), + validateResetPasswordBody: (payload, config) => + validateYupSchema(createResetPasswordSchema(config))(payload), + validateChangePasswordBody: (payload, config) => + validateYupSchema(createChangePasswordSchema(config))(payload), };