mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-07 20:28:08 -06:00
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
This commit is contained in:
parent
de1f90ee46
commit
2aaec82732
56 changed files with 1543 additions and 398 deletions
|
|
@ -30,6 +30,12 @@ import (
|
|||
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/processing"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/router"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/util"
|
||||
)
|
||||
|
||||
const (
|
||||
confirmEmailPath = "/" + util.ConfirmEmailPath
|
||||
tokenParam = "token"
|
||||
)
|
||||
|
||||
// Module implements the api.ClientModule interface for web pages.
|
||||
|
|
@ -100,6 +106,9 @@ func (m *Module) Route(s router.Router) error {
|
|||
// serve statuses
|
||||
s.AttachHandler(http.MethodGet, "/:user/statuses/:id", m.threadTemplateHandler)
|
||||
|
||||
// serve email confirmation page at /confirm_email?token=whatever
|
||||
s.AttachHandler(http.MethodGet, confirmEmailPath, m.confirmEmailGETHandler)
|
||||
|
||||
// 404 handler
|
||||
s.AttachNoRouteHandler(m.NotFoundHandler)
|
||||
|
||||
|
|
|
|||
57
internal/web/confirmemail.go
Normal file
57
internal/web/confirmemail.go
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
GoToSocial
|
||||
Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package web
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
func (m *Module) confirmEmailGETHandler(c *gin.Context) {
|
||||
// if there's no token in the query, just serve the 404 web handler
|
||||
token := c.Query(tokenParam)
|
||||
if token == "" {
|
||||
m.NotFoundHandler(c)
|
||||
return
|
||||
}
|
||||
|
||||
ctx := c.Request.Context()
|
||||
|
||||
user, errWithCode := m.processor.UserConfirmEmail(ctx, token)
|
||||
if errWithCode != nil {
|
||||
logrus.Debugf("error confirming email: %s", errWithCode.Error())
|
||||
// if something goes wrong, just log it and direct to the 404 handler to not give anything away
|
||||
m.NotFoundHandler(c)
|
||||
return
|
||||
}
|
||||
|
||||
instance, err := m.processor.InstanceGet(ctx, m.config.Host)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
c.HTML(http.StatusOK, "confirmed.tmpl", gin.H{
|
||||
"instance": instance,
|
||||
"email": user.Email,
|
||||
"username": user.Account.Username,
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue