From b7fd5f28fdf0afd02efc161910953411f677e675 Mon Sep 17 00:00:00 2001 From: Josh Johnston Date: Tue, 24 Mar 2020 17:32:10 +1100 Subject: [PATCH] Fix the order of settings in ses provider Why: - because there is a default hardcoded value in options.from, the custom value would never be used. Signed-off-by: Josh Johnston --- packages/strapi-provider-email-amazon-ses/lib/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-provider-email-amazon-ses/lib/index.js b/packages/strapi-provider-email-amazon-ses/lib/index.js index ea375d4b71..bb9dc84a18 100644 --- a/packages/strapi-provider-email-amazon-ses/lib/index.js +++ b/packages/strapi-provider-email-amazon-ses/lib/index.js @@ -48,8 +48,8 @@ module.exports = { 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.from = config.amazon_ses_default_from || options.from; + options.replyTo = config.amazon_ses_default_replyto || options.replyTo; options.text = options.text || options.html; options.html = options.html || options.text;