From 5be8a7a7ea96d962d0f0b9f09b967e403a227698 Mon Sep 17 00:00:00 2001 From: Forest Johnson Date: Mon, 31 Jan 2022 10:46:20 +0000 Subject: [bug] Send plaintext emails to fix "message refused: Message is not RFC 2822 compliant" (#366) * trying to fix "message refused: Message is not RFC 2822 compliant" * fix "message refused: Message is not RFC 2822 compliant" 550 5.7.1 Delivery not authorized, message refused: Message is not RFC 2822 compliant * remove silly regex * lint * fix tests * we should use text/template instead of html/template now --- web/template/email_confirm.tmpl | 29 ----------------------------- web/template/email_confirm_html.tmpl | 29 +++++++++++++++++++++++++++++ web/template/email_confirm_text.tmpl | 9 +++++++++ web/template/email_reset.tmpl | 29 ----------------------------- web/template/email_reset_html.tmpl | 29 +++++++++++++++++++++++++++++ web/template/email_reset_text.tmpl | 9 +++++++++ 6 files changed, 76 insertions(+), 58 deletions(-) delete mode 100644 web/template/email_confirm.tmpl create mode 100644 web/template/email_confirm_html.tmpl create mode 100644 web/template/email_confirm_text.tmpl delete mode 100644 web/template/email_reset.tmpl create mode 100644 web/template/email_reset_html.tmpl create mode 100644 web/template/email_reset_text.tmpl (limited to 'web') diff --git a/web/template/email_confirm.tmpl b/web/template/email_confirm.tmpl deleted file mode 100644 index 0a9907921..000000000 --- a/web/template/email_confirm.tmpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - -
-

- Hello {{.Username}}! -

-
-
-

- You are receiving this mail because you've requested an account on {{.InstanceName}}. -

-

- We just need to confirm that this is your email address. To confirm your email, click here or paste the following in your browser's address bar: -

-

- - {{.ConfirmLink}} - -

-
-
-

- If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceName}}. -

-
- - \ No newline at end of file diff --git a/web/template/email_confirm_html.tmpl b/web/template/email_confirm_html.tmpl new file mode 100644 index 000000000..0a9907921 --- /dev/null +++ b/web/template/email_confirm_html.tmpl @@ -0,0 +1,29 @@ + + + + +
+

+ Hello {{.Username}}! +

+
+
+

+ You are receiving this mail because you've requested an account on {{.InstanceName}}. +

+

+ We just need to confirm that this is your email address. To confirm your email, click here or paste the following in your browser's address bar: +

+

+ + {{.ConfirmLink}} + +

+
+
+

+ If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceName}}. +

+
+ + \ No newline at end of file diff --git a/web/template/email_confirm_text.tmpl b/web/template/email_confirm_text.tmpl new file mode 100644 index 000000000..8682cc49c --- /dev/null +++ b/web/template/email_confirm_text.tmpl @@ -0,0 +1,9 @@ +Hello {{.Username}}! + +You are receiving this mail because you've requested an account on {{.InstanceURL}}. + +We just need to confirm that this is your email address. To confirm your email, paste the following in your browser's address bar: + +{{.ConfirmLink}} + +If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceURL}} diff --git a/web/template/email_reset.tmpl b/web/template/email_reset.tmpl deleted file mode 100644 index 7318c6a45..000000000 --- a/web/template/email_reset.tmpl +++ /dev/null @@ -1,29 +0,0 @@ - - - - -
-

- Hello {{.Username}}! -

-
-
-

- You are receiving this mail because a password reset has been requested for your account on {{.InstanceName}}. -

-

- To reset your password, click here or paste the following in your browser's address bar: -

-

- - {{.ResetLink}} - -

-
-
-

- If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceName}}. -

-
- - \ No newline at end of file diff --git a/web/template/email_reset_html.tmpl b/web/template/email_reset_html.tmpl new file mode 100644 index 000000000..7318c6a45 --- /dev/null +++ b/web/template/email_reset_html.tmpl @@ -0,0 +1,29 @@ + + + + +
+

+ Hello {{.Username}}! +

+
+
+

+ You are receiving this mail because a password reset has been requested for your account on {{.InstanceName}}. +

+

+ To reset your password, click here or paste the following in your browser's address bar: +

+

+ + {{.ResetLink}} + +

+
+
+

+ If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceName}}. +

+
+ + \ No newline at end of file diff --git a/web/template/email_reset_text.tmpl b/web/template/email_reset_text.tmpl new file mode 100644 index 000000000..ccac3bf75 --- /dev/null +++ b/web/template/email_reset_text.tmpl @@ -0,0 +1,9 @@ +Hello {{.Username}}! + +You are receiving this mail because a password reset has been requested for your account on {{.InstanceURL}}. + +To reset your password, paste the following in your browser's address bar: + +{{.ResetLink}} + +If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceURL}}. -- cgit v1.2.3