Преглед изворни кода

Merge pull request #531 from sharelatex/sk-allow-explicit-ses-email-config

Instantiate the ses client if explicitly specified.
Shane Kilkelly пре 9 година
родитељ
комит
586d1f1599
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      services/web/app/coffee/Features/Email/EmailSender.coffee

+ 1 - 1
services/web/app/coffee/Features/Email/EmailSender.coffee

@@ -18,7 +18,7 @@ client =
 		logger.log options:options, "Would send email if enabled."
 		logger.log options:options, "Would send email if enabled."
 		callback()
 		callback()
 
 
-if Settings?.email?.parameters?.AWSAccessKeyID?
+if Settings?.email?.parameters?.AWSAccessKeyID? or Settings?.email?.driver == 'ses'
 	logger.log "using aws ses for email"
 	logger.log "using aws ses for email"
 	nm_client = nodemailer.createTransport(sesTransport(Settings.email.parameters))
 	nm_client = nodemailer.createTransport(sesTransport(Settings.email.parameters))
 else if Settings?.email?.parameters?.sendgridApiKey?
 else if Settings?.email?.parameters?.sendgridApiKey?