refactor email send functions

mail.go

@@ -1,27 +1,39 @@
 package main
 
 import (
-	"bytes"
 	"log"
 	"net/smtp"
 )
 
-func sendEmail(username, confirm_id string) {
+func sendEmail(mail_to, mail_default_authuser, mail_message string) {
-	c, err := smtp.Dial("127.0.0.1:25")
+	var auth smtp.Auth
+	if getenv("MAILSERVER_USER", "") != "" {
+		// Set up authentication information.
+		auth = smtp.PlainAuth(
+			"",
+			getenv("MAILSERVER_USER", ""),
+			getenv("MAILSERVER_PASSWORD", ""),
+			getenv("MAILSERVER_HOST", "127.0.0.1"),
+		)
+	}
+	// Connect to the server, authenticate, set the sender and recipient,
+	// and send the email all in one step.
+	err := smtp.SendMail(
+		getenv("MAILSERVER_HOST", "127.0.0.1")+":"+getenv("MAILSERVER_PORT", "25"),
+		auth,
+		getenv("MAILSERVER_USER", mail_default_authuser),
+		[]string{mail_to},
+		[]byte(mail_message),
+	)
+
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer c.Close()
-	// Set the sender and recipient.
-	c.Mail("register@wo-bisch.ch")
-	c.Rcpt(username)
-	// Send the email body.
-	wc, err := c.Data()
-	if err != nil {
-		log.Fatal(err)
 }
-	defer wc.Close()
+
+func sendEmailConfirm(username, confirm_id string) {
 	mail_message := "To: " + username + `
+From: register@wo-bisch.ch
 Subject: Passwortaenderung auf https://wo-bisch.ch, bitte bestaetigen
 
 Lieber Benutzer von wo-bisch.ch
@@ -37,28 +49,12 @@ Mit freundlichen Grüssen
 --
 wo-bisch.ch`
 
-	buf := bytes.NewBufferString(mail_message)
+	sendEmail(username, "mail@wo-bisch.ch", mail_message)
-	if _, err = buf.WriteTo(wc); err != nil {
-		log.Fatal(err)
-	}
 }
 
 func sendPaymentConfirmationEmail(username, charge_data string, amount int64) {
-	c, err := smtp.Dial("127.0.0.1:25")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	// Set the sender and recipient.
-	c.Mail("info@wo-bisch.ch")
-	c.Rcpt(username)
-	// Send the email body.
-	wc, err := c.Data()
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer wc.Close()
 	mail_message := "To: " + username + `
+From: info@wo-bisch.ch
 Subject: Zahlungsbestaetigung wo-bisch.ch
 
 Lieber Benutzer von wo-bisch.ch
@@ -71,28 +67,12 @@ Mit freundlichen Grüssen
 --
 wo-bisch.ch`
 
-	buf := bytes.NewBufferString(mail_message)
+	sendEmail(username, "mail@wo-bisch.ch", mail_message)
-	if _, err = buf.WriteTo(wc); err != nil {
-		log.Fatal(err)
-	}
 }
 
 func sendOrderEmail(username, body string) {
-	c, err := smtp.Dial("127.0.0.1:25")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	// Set the sender and recipient.
-	c.Mail("info@wo-bisch.ch")
-	c.Rcpt(username)
-	// Send the email body.
-	wc, err := c.Data()
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer wc.Close()
 	mail_message := "To: " + username + `
+From: info@wo-bisch.ch
 Subject: Bestelleingang auf https://wo-bisch.ch
 
 Lieber Administrator
@@ -105,8 +85,5 @@ Mit freundlichen Grüssen
 --
 wo-bisch.ch`
 
-	buf := bytes.NewBufferString(mail_message)
+	sendEmail(username, "mail@wo-bisch.ch", mail_message)
-	if _, err = buf.WriteTo(wc); err != nil {
-		log.Fatal(err)
-	}
 }

persistence.go

@@ -452,7 +452,7 @@ func updateUser(username, password string) {
 		return
 	}
 
-	sendEmail(username, confirm_id)
+	sendEmailConfirm(username, confirm_id)
 }
 
 func checkLoginCredentials(username, password string) bool {