yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 06:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix update user email

Browse Source
This commit is contained in:
Jim LAURIE 2019-01-22 11:41:49 +01:00
parent 6478e1f2b3
commit b4968697a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-users-permissions/controllers/User.js
View File

@ -120,7 +120,7 @@ module.exports = {
if (advancedConfigs.unique_email && ctx.request.body.email) { if (advancedConfigs.unique_email && ctx.request.body.email) {
const users = await strapi.plugins['users-permissions'].services.user.fetchAll({ 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.'); 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 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.'); return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.email.taken', field: ['email'] }] }] : 'Email is already taken.');
} }
} }