Skip to content

Specify mimetype for email attachments #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Specify mimetype for email attachments #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions emailer/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package emailer
type Attachment struct {
Name string
Data []byte
MimeType string
}

type Emailer interface {
Expand Down
2 changes: 1 addition & 1 deletion emailer/sendgrid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (o *SendgridApiMail) Send(toName string, to string, subject string, content
var att mail.Attachment
encoded := base64.StdEncoding.EncodeToString(attachments[i].Data)
att.SetContent(encoded)
att.SetType("text/plain")
att.SetType(attachments[i].MimeType)
att.SetFilename(attachments[i].Name)
att.SetDisposition("attachment")
toAdd = append(toAdd, &att)
Expand Down
2 changes: 1 addition & 1 deletion emailer/smtp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (o *SmtpMail) Send(toName string, to string, subject string, content string
SetBody(mail.TextHTML, content)

for _, v := range attachments {
email.Attach(&mail.File{Name: v.Name, Data: v.Data})
email.Attach(&mail.File{Name: v.Name, Data: v.Data, MimeType: v.MimeType})
}

err = email.Send(smtpClient)
Expand Down
4 changes: 2 additions & 2 deletions handler/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,14 +547,14 @@ func EmailClient(db store.IStore, mailer emailer.Emailer, emailSubject, emailCon
globalSettings, _ := db.GetGlobalSettings()
config := util.BuildClientConfig(*clientData.Client, server, globalSettings)

cfgAtt := emailer.Attachment{Name: "wg0.conf", Data: []byte(config)}
cfgAtt := emailer.Attachment{Name: "wg0.conf", Data: []byte(config), MimeType: "text/conf"}
var attachments []emailer.Attachment
if clientData.Client.PrivateKey != "" {
qrdata, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(clientData.QRCode, "data:image/png;base64,"))
if err != nil {
return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "decoding: " + err.Error()})
}
qrAtt := emailer.Attachment{Name: "wg.png", Data: qrdata}
qrAtt := emailer.Attachment{Name: "wg.png", Data: qrdata, MimeType: "image/png"}
attachments = []emailer.Attachment{cfgAtt, qrAtt}
} else {
attachments = []emailer.Attachment{cfgAtt}
Expand Down