From b4968697a0b70e5b7c2162efceaf7b5151c4080d Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Tue, 22 Jan 2019 11:41:49 +0100 Subject: [PATCH] Fix update user email --- packages/strapi-plugin-users-permissions/controllers/User.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/controllers/User.js b/packages/strapi-plugin-users-permissions/controllers/User.js index 7e496e724d..8f1d9d695a 100644 --- a/packages/strapi-plugin-users-permissions/controllers/User.js +++ b/packages/strapi-plugin-users-permissions/controllers/User.js @@ -120,7 +120,7 @@ module.exports = { if (advancedConfigs.unique_email && ctx.request.body.email) { const users = await strapi.plugins['users-permissions'].services.user.fetchAll({ email: ctx.request.body.email }); - if (users && _.find(users, user => (user.id || user._id).toString() !== ctx.params._id)) { + if (users && _.find(users, user => (user.id || user._id).toString() !== (ctx.params.id || ctx.params._id))) { return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.email.taken', field: ['email'] }] }] : 'Email is already taken.'); } } @@ -140,7 +140,7 @@ module.exports = { email: ctx.request.body.email }); - if (user !== null && (user.id || user._id).toString() !== ctx.params._id) { + if (user !== null && (user.id || user._id).toString() !== (ctx.params.id || ctx.params._id)) { return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.email.taken', field: ['email'] }] }] : 'Email is already taken.'); } }