Merge pull request #1 from hdm/preserve-to-and-from-names

Preserve the From and To names in from/to

sendgrid_sender.go

@@ -2,8 +2,11 @@ package sender
 
 import (
 	"errors"
+	"fmt"
 	"os"
 
+	nmail "net/mail"
+
 	"github.com/gobuffalo/buffalo/mail"
 	sendgrid "github.com/sendgrid/sendgrid-go"
 	smail "github.com/sendgrid/sendgrid-go/helpers/mail"
@@ -29,20 +32,28 @@ func (ps SendgridSender) Send(m mail.Message) error {
 	}
 
 	mm := new(smail.SGMailV3)
-	mm.SetFrom(smail.NewEmail("", m.From))
+	from, err := nmail.ParseAddress(m.From)
+	if err != nil {
+		return fmt.Errorf("invalid from (%s): %s", from, err.Error())
+	}
+	mm.SetFrom(smail.NewEmail(from.Name, from.Address))
 	mm.Subject = m.Subject
 
 	p := smail.NewPersonalization()
-	for _, to := range m.To {
-		p.AddTos(smail.NewEmail("", to))
+	for _, toEmail := range m.To {
+		to, err := nmail.ParseAddress(toEmail)
+		if err != nil {
+			return fmt.Errorf("invalid to (%s): %s", toEmail, err.Error())
+		}
+		p.AddTos(smail.NewEmail(to.Name, to.Address))
 	}
 
 	html := smail.NewContent("text/html", m.Bodies[0].Content)
 	text := smail.NewContent("text/plain", m.Bodies[1].Content)
 	mm.AddPersonalizations(p)
 	mm.AddContent(text, html)
 
-	_, err := ps.client.Send(mm)
+	_, err = ps.client.Send(mm)
 	return err
 }