yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 15:44:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: refactoring validation methods

Browse Source
This commit is contained in:
Bassel Kanso 2024-10-02 12:03:28 +03:00
parent 402e635b13
commit 483fc83a30
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/plugins/users-permissions/server/controllers/auth.js
View File

@ -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')

15
packages/plugins/users-permissions/server/controllers/validation/auth.js
View File

@ -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),
};