Skip to content

Commit 795bb0a

Browse files
committed
fix(smtp): use param props from params arg
was ignoring encryption, subject, fromname and fromaddress
1 parent 3c77fd5 commit 795bb0a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pkg/services/smtp/smtp.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (service *Service) Send(message string, params *types.Params) error {
7171
return fail(FailApplySendParams, err)
7272
}
7373

74-
client, err := getClientConnection(service.config)
74+
client, err := getClientConnection(&config)
7575
if err != nil {
7676
return fail(FailGetSMTPClient, err)
7777
}
@@ -206,7 +206,7 @@ func (service *Service) sendToRecipient(client *smtp.Client, toAddress string, c
206206
return fail(FailOpenDataStream, err)
207207
}
208208

209-
if err := writeHeaders(wc, service.getHeaders(toAddress, config.Subject)); err != nil {
209+
if err := writeHeaders(wc, service.getHeaders(toAddress, config)); err != nil {
210210
return err
211211
}
212212

@@ -228,9 +228,7 @@ func (service *Service) sendToRecipient(client *smtp.Client, toAddress string, c
228228
return nil
229229
}
230230

231-
func (service *Service) getHeaders(toAddress string, subject string) map[string]string {
232-
conf := service.config
233-
231+
func (service *Service) getHeaders(toAddress string, conf *Config) map[string]string {
234232
var contentType string
235233
if conf.UseHTML {
236234
contentType = fmt.Sprintf(contentMultipart, service.multipartBoundary)
@@ -239,7 +237,7 @@ func (service *Service) getHeaders(toAddress string, subject string) map[string]
239237
}
240238

241239
return map[string]string{
242-
"Subject": subject,
240+
"Subject": conf.Subject,
243241
"Date": time.Now().Format(time.RFC1123Z),
244242
"To": toAddress,
245243
"From": fmt.Sprintf("%s <%s>", conf.FromName, conf.FromAddress),

0 commit comments

Comments
 (0)