[MM-42522] - The reply-to email address in our Cloud trial emails is no-reply@mattermost.com instead of feedback-cloud@mattermost.com (#19899)

* [MM-42522] - The reply-to email address in our Cloud trial emails is no-reply@mattermost.com instead of feedback-cloud@mattermost.com

* feedback impl
Этот коммит содержится в:
Allan Guwatudde
2022-04-07 16:48:05 +03:00
коммит произвёл GitHub
родитель 5b10b2791b
Коммит 762caaeb51
3 изменённых файлов: 81 добавлений и 9 удалений

Просмотреть файл

@@ -8,9 +8,14 @@ import (
"github.com/mattermost/mattermost-server/v6/utils"
)
func (es *Service) mailServiceConfig() *mail.SMTPConfig {
func (es *Service) mailServiceConfig(replyToAddress string) *mail.SMTPConfig {
emailSettings := es.config().EmailSettings
hostname := utils.GetHostnameFromSiteURL(*es.config().ServiceSettings.SiteURL)
if replyToAddress == "" {
replyToAddress = *emailSettings.ReplyToAddress
}
cfg := mail.SMTPConfig{
Hostname: hostname,
ConnectionSecurity: *emailSettings.ConnectionSecurity,
@@ -25,7 +30,7 @@ func (es *Service) mailServiceConfig() *mail.SMTPConfig {
SendEmailNotifications: *emailSettings.SendEmailNotifications,
FeedbackName: *emailSettings.FeedbackName,
FeedbackEmail: *emailSettings.FeedbackEmail,
ReplyToAddress: *emailSettings.ReplyToAddress,
ReplyToAddress: replyToAddress,
}
return &cfg
}