switch activation mail to HTML

mantil-io · Nov 24, 2021 · b811a89 · b811a89
1 parent acc3f3a
commit b811a89
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 9 deletions.
diff --git a/backend/api/signup/mailing.go b/backend/api/signup/mailing.go
@@ -16,12 +16,20 @@ func (r *Signup) sendActivationCode(email, name, activationCode string) error {
 	toEmail := email
 	fromEmail := texts.MailFrom
 	subject := texts.ActivationMailSubject
-	body, err := texts.ActivationMailBody(name, activationCode)
+
+	// body, err := texts.ActivationMailBody(name, activationCode)
+	// if err != nil {
+	// 	log.Printf("failed to get mail body: %s", err)
+	// 	return err
+	// }
+
+	body, err := texts.ActivationHTMLMailBody(name, activationCode)
 	if err != nil {
 		log.Printf("failed to get mail body: %s", err)
 		return err
 	}
-	return r.sendEmail(fromEmail, toEmail, subject, body)
+
+	return r.sendEmail(fromEmail, toEmail, subject, "", body)
 }
 
 func (r Signup) sendWelcomeMail(email, name string) error {
@@ -33,10 +41,10 @@ func (r Signup) sendWelcomeMail(email, name string) error {
 		log.Printf("failed to get mail body: %s", err)
 		return err
 	}
-	return r.sendEmail(fromEmail, toEmail, subject, body)
+	return r.sendEmail(fromEmail, toEmail, subject, body, "")
 }
 
-func (r *Signup) sendEmail(fromEmail, toEmail, subject, body string) error {
+func (r *Signup) sendEmail(fromEmail, toEmail, subject, body, htmlBody string) error {
 	if toEmail == signup.TestEmail { // don't send email for integration test
 		return nil
 	}
@@ -50,11 +58,7 @@ func (r *Signup) sendEmail(fromEmail, toEmail, subject, body string) error {
 
 	smi := &ses.SendEmailInput{
 		Message: &types.Message{
-			Body: &types.Body{
-				Text: &types.Content{
-					Data: aws.String(body),
-				},
-			},
+			Body: &types.Body{},
 			Subject: &types.Content{
 				Data: aws.String(subject),
 			},
@@ -65,6 +69,12 @@ func (r *Signup) sendEmail(fromEmail, toEmail, subject, body string) error {
 		Source: aws.String(fromEmail),
 	}
 
+	if htmlBody == "" {
+		smi.Message.Body.Text = &types.Content{Data: aws.String(body)}
+	} else {
+		smi.Message.Body.Html = &types.Content{Data: aws.String(htmlBody)}
+	}
+
 	if _, err := cli.SendEmail(context.Background(), smi); err != nil {
 		log.Printf("send email error: %s", err)
 		return err

diff --git a/texts/activation.html b/texts/activation.html
@@ -0,0 +1,152 @@
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Mantil Activation Email</title>
+    <style>
+@media only screen and (max-width: 620px) {
+  table.body h1 {
+    font-size: 28px !important;
+    margin-bottom: 10px !important;
+  }
+
+  table.body p,
+table.body ul,
+table.body ol,
+table.body td,
+table.body span,
+table.body a {
+    font-size: 16px !important;
+  }
+
+  table.body .wrapper,
+table.body .article {
+    padding: 10px !important;
+  }
+
+  table.body .content {
+    padding: 0 !important;
+  }
+
+  table.body .container {
+    padding: 0 !important;
+    width: 100% !important;
+  }
+
+  table.body .main {
+    border-left-width: 0 !important;
+    border-radius: 0 !important;
+    border-right-width: 0 !important;
+  }
+
+  table.body .btn table {
+    width: 100% !important;
+  }
+
+  table.body .btn a {
+    width: 100% !important;
+  }
+
+  table.body .img-responsive {
+    height: auto !important;
+    max-width: 100% !important;
+    width: auto !important;
+  }
+}
+@media all {
+  .ExternalClass {
+    width: 100%;
+  }
+
+  .ExternalClass,
+.ExternalClass p,
+.ExternalClass span,
+.ExternalClass font,
+.ExternalClass td,
+.ExternalClass div {
+    line-height: 100%;
+  }
+
+  .apple-link a {
+    color: inherit !important;
+    font-family: inherit !important;
+    font-size: inherit !important;
+    font-weight: inherit !important;
+    line-height: inherit !important;
+    text-decoration: none !important;
+  }
+
+  #MessageViewBody a {
+    color: inherit;
+    text-decoration: none;
+    font-size: inherit;
+    font-family: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+  }
+
+  .btn-primary table td:hover {
+    background-color: #34495e !important;
+  }
+
+  .btn-primary a:hover {
+    background-color: #34495e !important;
+    border-color: #34495e !important;
+  }
+}
+</style>
+  </head>
+  <body class="" style="background-color: #f6f6f6; font-family: sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+    <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Mantil activation instructions</span>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f6f6f6; width: 100%;" width="100%" bgcolor="#f6f6f6">
+      <tr>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">&nbsp;</td>
+        <td class="container" style="font-family: sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 580px; padding: 10px; width: 580px; margin: 0 auto;" width="580" valign="top">
+          <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 580px; padding: 10px;">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <table role="presentation" class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; width: 100%;" width="100%">
+
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;" valign="top">
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+                    <tr>
+                      <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
+                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">Hi {{.Name}}, 👋</p>
+                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">Your activation code is: {{.ActivationCode}}.<br>Use it in a terminal to finalize your Mantil registration:</p>
+                        <p style="font-family: Consolas,monospace; font-size: 14px; font-weight: normal; margin: 0; margin-left: 0px; margin-bottom: 15px;">mantil activate {{.ActivationCode}}</p>
+                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">If you haven’t already you will need to install Mantil CLI first. You can do it over Homebrew: </p>
+                        <pre style="font-family: Consolas,monospace; font-size: 14px; font-weight: normal; margin: 0; margin-left: 0px; margin-bottom: 15px;">brew tap mantil-io/mantil<br>brew install mantil</pre>
+                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">or with direct download. Check <a href="https://github.com/mantil-io/docs#installation">Installation documentation</a> for detailed instructions.</p>
+                        <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">Have fun!<br>Mantil Team</p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+            <!-- END CENTERED WHITE CONTAINER -->
+
+            <!-- START FOOTER -->
+            <div class="footer" style="clear: both; margin-top: 10px; text-align: center; width: 100%;">
+              <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+                <tr>
+                  <td class="content-block" style="font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; color: #999999; font-size: 12px; text-align: center;" valign="top" align="center">
+                    <span class="apple-link" style="color: #999999; font-size: 12px; text-align: center;">AtoZ Technology Ltd., Zagreb, Croatia</span>
+                  </td>
+                </tr>
+              </table>
+            </div>
+            <!-- END FOOTER -->
+
+          </div>
+        </td>
+        <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/texts/texts.go b/texts/texts.go
@@ -13,6 +13,9 @@ const WelcomeMailSubject = "Welcome to Mantil!"
 //go:embed activationMailBody
 var activationMailBodyTemplate string
 
+//go:embed activation.html
+var activationMailHTMLBodyTemplate string
+
 //go:embed welcomeMailBody
 var welcomeMailBodyTemplate string
 
@@ -46,3 +49,12 @@ func renderTemplate(data interface{}, content string) (string, error) {
 	}
 	return buf.String(), nil
 }
+
+func ActivationHTMLMailBody(name, activationCode string) (string, error) {
+	data := struct {
+		Name           string
+		ActivationCode string
+	}{name, activationCode}
+
+	return renderTemplate(data, activationMailHTMLBodyTemplate)
+}
diff --git a/texts/texts_test.go b/texts/texts_test.go
@@ -1,6 +1,9 @@
 package texts
 
 import (
+	"fmt"
+	"io/ioutil"
+	"os/exec"
 	"strings"
 	"testing"
 
@@ -14,3 +17,12 @@ func TestActivationMailBody(t *testing.T) {
 	require.True(t, strings.Contains(content, "ianic"))
 	require.True(t, strings.Contains(content, "1234567890"))
 }
+
+func TestHTMLActivationMail(t *testing.T) {
+	content, err := ActivationHTMLMailBody("Ksenija", "3UTZElNhReugz-3JVfU4nQ")
+	require.NoError(t, err)
+	file, err := ioutil.TempFile("", "*.html")
+	fmt.Fprint(file, content)
+	t.Logf("created: %s\n", file.Name())
+	exec.Command("open", file.Name()).Start()
+}