From 45d83ea3f54750e17e93c98c1de9658bbe7d9772 Mon Sep 17 00:00:00 2001 From: Dacre Denny Date: Sat, 21 Mar 2020 02:02:47 +1300 Subject: [PATCH] Removed unused 'cb' callback on send method of Email service and Email providers (#5371) Signed-off-by: dacre-denny --- packages/strapi-plugin-email/services/Email.js | 4 ++-- packages/strapi-provider-email-amazon-ses/lib/index.js | 5 ++--- packages/strapi-provider-email-mailgun/lib/index.js | 2 +- packages/strapi-provider-email-sendgrid/lib/index.js | 2 +- packages/strapi-provider-email-sendmail/lib/index.js | 6 ++---- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/strapi-plugin-email/services/Email.js b/packages/strapi-plugin-email/services/Email.js index 2c1f8a7f70..df9d912aff 100644 --- a/packages/strapi-plugin-email/services/Email.js +++ b/packages/strapi-plugin-email/services/Email.js @@ -48,7 +48,7 @@ const getProviderConfig = async env => { module.exports = { getProviderConfig, - async send(options, config, cb) { + async send(options, config) { // Get email provider settings to configure the provider to use. if (!config) { config = await getProviderConfig(strapi.config.environment); @@ -67,6 +67,6 @@ module.exports = { const actions = await provider.init(config); // Execute email function of the provider for all files. - return actions.send(options, cb); + return actions.send(options); }, }; diff --git a/packages/strapi-provider-email-amazon-ses/lib/index.js b/packages/strapi-provider-email-amazon-ses/lib/index.js index e0b22674eb..ea375d4b71 100644 --- a/packages/strapi-provider-email-amazon-ses/lib/index.js +++ b/packages/strapi-provider-email-amazon-ses/lib/index.js @@ -44,13 +44,12 @@ module.exports = { }); return { - send: (options, cb) => { + send: options => { return new Promise((resolve, reject) => { // Default values. options = _.isObject(options) ? options : {}; options.from = options.from || config.amazon_ses_default_from; - options.replyTo = - options.replyTo || config.amazon_ses_default_replyto; + options.replyTo = options.replyTo || config.amazon_ses_default_replyto; options.text = options.text || options.html; options.html = options.html || options.text; diff --git a/packages/strapi-provider-email-mailgun/lib/index.js b/packages/strapi-provider-email-mailgun/lib/index.js index edce0f03f7..2c3af2ce5e 100644 --- a/packages/strapi-provider-email-mailgun/lib/index.js +++ b/packages/strapi-provider-email-mailgun/lib/index.js @@ -44,7 +44,7 @@ module.exports = { }); return { - send: (options, cb) => { + send: options => { return new Promise((resolve, reject) => { // Default values. options = isObject(options) ? options : {}; diff --git a/packages/strapi-provider-email-sendgrid/lib/index.js b/packages/strapi-provider-email-sendgrid/lib/index.js index b6e1fa03e6..383a94f5c4 100644 --- a/packages/strapi-provider-email-sendgrid/lib/index.js +++ b/packages/strapi-provider-email-sendgrid/lib/index.js @@ -31,7 +31,7 @@ module.exports = { sendgrid.setApiKey(config.sendgrid_api_key); return { - send: (options, cb) => { + send: options => { return new Promise((resolve, reject) => { // Default values. options = _.isObject(options) ? options : {}; diff --git a/packages/strapi-provider-email-sendmail/lib/index.js b/packages/strapi-provider-email-sendmail/lib/index.js index 0ced57f85b..bdb98ba3b2 100644 --- a/packages/strapi-provider-email-sendmail/lib/index.js +++ b/packages/strapi-provider-email-sendmail/lib/index.js @@ -26,7 +26,7 @@ module.exports = { }, init: config => { return { - send: (options, cb) => { + send: options => { return new Promise((resolve, reject) => { // Default values. options = _.isObject(options) ? options : {}; @@ -47,9 +47,7 @@ module.exports = { }, function(err) { if (err) { - reject([ - { messages: [{ id: 'Auth.form.error.email.invalid' }] }, - ]); + reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]); } else { resolve(); }