diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-10-31 15:46:23 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-31 15:46:23 +0100 |
| commit | 2aaec827321ec711b98e13335899cf750f270105 (patch) | |
| tree | bafa15a0c2a469adf97b2c437fdc31428516424e /web | |
| parent | regenerate swagger docs (#293) (diff) | |
| download | gotosocial-2aaec827321ec711b98e13335899cf750f270105.tar.xz | |
smtp + email confirmation (#285)
* add smtp configuration
* add email confirm + reset templates
* add email sender to testrig
* flesh out the email sender interface
* go fmt
* golint
* update from field with more clarity
* tidy up the email formatting
* fix tests
* add email sender to processor
* tidy client api processing a bit
* further tidying in fromClientAPI
* pin new account to user
* send msg to processor on new account creation
* generate confirm email uri
* remove emailer from account processor again
* add processCreateAccountFromClientAPI
* move emailer accountprocessor => userprocessor
* add email sender to user processor
* SendConfirmEmail function
* add noop email sender
* use noop email sender in tests
* only assemble message if callback is not nil
* use noop email sender if no smtp host is defined
* minify email html before sending
* fix wrong email address
* email confirm test
* fmt
* serve web hndler
* add email confirm handler
* init test log properly on testrig
* log emails that *would* have been sent
* go fmt ./...
* unexport confirm email handler
* updatedAt
* test confirm email function
* don't allow tokens older than 7 days
* change error message a bit
* add basic smtp docs
* add a few more snippets
* typo
* add email sender to outbox tests
* don't use dutch wikipedia link
* don't minify email html
Diffstat (limited to 'web')
| -rw-r--r-- | web/template/confirmed.tmpl | 9 | ||||
| -rw-r--r-- | web/template/email_confirm.tmpl | 29 | ||||
| -rw-r--r-- | web/template/email_reset.tmpl | 29 |
3 files changed, 67 insertions, 0 deletions
diff --git a/web/template/confirmed.tmpl b/web/template/confirmed.tmpl new file mode 100644 index 000000000..920f7d3b2 --- /dev/null +++ b/web/template/confirmed.tmpl @@ -0,0 +1,9 @@ +{{ template "header.tmpl" .}} +<main> + <section> + <h1>Email Address Confirmed</h1> + <p>Thanks {{.username}}! Your email address <b>{{.email}}</b> has been confirmed.<p> + </section> +</main> + +{{ template "footer.tmpl" .}}
\ No newline at end of file diff --git a/web/template/email_confirm.tmpl b/web/template/email_confirm.tmpl new file mode 100644 index 000000000..0a9907921 --- /dev/null +++ b/web/template/email_confirm.tmpl @@ -0,0 +1,29 @@ +<!DOCTYPE html> +<html> + </head> + <body> + <div> + <h1> + Hello {{.Username}}! + </h1> + </div> + <div> + <p> + You are receiving this mail because you've requested an account on <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. + </p> + <p> + We just need to confirm that this is your email address. To confirm your email, <a href="{{.ConfirmLink}}">click here</a> or paste the following in your browser's address bar: + </p> + <p> + <code> + {{.ConfirmLink}} + </code> + </p> + </div> + <div> + <p> + If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. + </p> + </div> + </body> +</html>
\ No newline at end of file diff --git a/web/template/email_reset.tmpl b/web/template/email_reset.tmpl new file mode 100644 index 000000000..7318c6a45 --- /dev/null +++ b/web/template/email_reset.tmpl @@ -0,0 +1,29 @@ +<!DOCTYPE html> +<html> + </head> + <body> + <div> + <h1> + Hello {{.Username}}! + </h1> + </div> + <div> + <p> + You are receiving this mail because a password reset has been requested for your account on <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. + </p> + <p> + To reset your password, <a href="{{.ResetLink}}">click here</a> or paste the following in your browser's address bar: + </p> + <p> + <code> + {{.ResetLink}} + </code> + </p> + </div> + <div> + <p> + If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. + </p> + </div> + </body> +</html>
\ No newline at end of file |