yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-25 06:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup email confirmation api

Browse Source
This commit is contained in:
Alexandre Bodin 2022-06-01 17:59:30 +02:00
parent e42e6444d7
commit 291e2b6835
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ const {
validateSendEmailConfirmationBody,
validateForgotPasswordBody,
validateResetPasswordBody,
validateEmailConfirmationBody,
} = require('./validation/auth');
const { getAbsoluteAdminUrl, getAbsoluteServerUrl, sanitize } = utils;
@ -328,19 +329,17 @@ module.exports = {
},
async emailConfirmation(ctx, next, returnUser) {
const { confirmation: confirmationToken } = ctx.query;
const { confirmation: confirmationToken } = await validateEmailConfirmationBody(ctx.query);
console.log(confirmationToken);
const userService = getService('user');
const jwtService = getService('jwt');
if (_.isEmpty(confirmationToken)) {
throw new ValidationError('token.invalid');
}
const [user] = await userService.fetchAll({ filters: { confirmationToken } });
if (!user) {
throw new ValidationError('token.invalid');
throw new ValidationError('Invalid token');
}
await userService.edit(user.id, { confirmed: true, confirmationToken: null });

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

@ -23,6 +23,10 @@ const sendEmailConfirmationSchema = yup.object({
.required(),
});
const validateEmailConfirmationSchema = yup.object({
confirmation: yup.string().required(),
});
const forgotPasswordSchema = yup
.object({
email: yup
@ -44,6 +48,7 @@ module.exports = {
validateCallbackBody: validateYupSchema(callbackSchema),
validateRegisterBody: validateYupSchema(registerSchema),
validateSendEmailConfirmationBody: validateYupSchema(sendEmailConfirmationSchema),
validateEmailConfirmationBody: validateYupSchema(validateEmailConfirmationSchema),
validateForgotPasswordBody: validateYupSchema(forgotPasswordSchema),
validateResetPasswordBody: validateYupSchema(resetPasswordSchema),
};