From de395dfc88b9e3ae03ee4b3ffb24d2a4425fabec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20No=C3=ABl?= Date: Mon, 29 Jun 2020 14:36:52 +0200 Subject: [PATCH] refacto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pierre Noël --- packages/strapi-admin/services/auth.js | 6 +++--- packages/strapi-plugin-email/services/Email.js | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/strapi-admin/services/auth.js b/packages/strapi-admin/services/auth.js index e4318d2086..03a2468314 100644 --- a/packages/strapi-admin/services/auth.js +++ b/packages/strapi-admin/services/auth.js @@ -68,10 +68,10 @@ const forgotPassword = async ({ email } = {}) => { .sendTemplatedEmail( { to: user.email, - from: strapi.config.get('server.admin.forgotPassword', {}).from, - replyTo: strapi.config.get('server.admin.forgotPassword', {}).replyTo, + from: strapi.config.get('server.admin.forgotPassword.from'), + replyTo: strapi.config.get('server.admin.forgotPassword.replyTo'), }, - strapi.config.get('server.admin.forgotPassword', {}).emailTemplate, + strapi.config.get('server.admin.forgotPassword.emailTemplate'), { url, user: _.pick(user, ['email', 'firstname', 'lastname', 'username']), diff --git a/packages/strapi-plugin-email/services/Email.js b/packages/strapi-plugin-email/services/Email.js index fa15a64f1d..b1539be7fb 100644 --- a/packages/strapi-plugin-email/services/Email.js +++ b/packages/strapi-plugin-email/services/Email.js @@ -26,12 +26,13 @@ const sendTemplatedEmail = (emailOptions = {}, emailTemplate = {}, data = {}) => ); } - const templatedAttributes = {}; - for (let attribute of attributes) { - if (emailTemplate[attribute]) { - templatedAttributes[attribute] = _.template(emailTemplate[attribute])(data); - } - } + const templatedAttributes = attributes.reduce( + (compiled, attribute) => + emailTemplate[attribute] + ? Object.assign(compiled, { [attribute]: _.template(emailTemplate[attribute])(data) }) + : compiled, + {} + ); return strapi.plugins.email.provider.send({ ...emailOptions, ...templatedAttributes }); };