deblan-mirror/dnote
1
0
Fork 0
mirror of https://github.com/dnote/dnote synced 2026-03-14 22:45:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Backward compatible verify email

Browse source
This commit is contained in:
Sung Won Cho 2022-04-23 16:01:23 +10:00
commit 45aa7dc37c
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/server/controllers/routes.go
View file

@ -40,7 +40,7 @@ func NewWebRoutes(a *app.App, c *Controllers) []Route {
{"GET", "/password-reset/{token}", c.Users.PasswordResetConfirm, true},
{"POST", "/reset-token", c.Users.CreateResetToken, true},
{"POST", "/verification-token", mw.Auth(a, c.Users.CreateEmailVerificationToken, redirectGuest), true},
{"GET", "/verify-email", mw.Auth(a, c.Users.VerifyEmail, redirectGuest), true},
{"GET", "/verify-email/{token}", mw.Auth(a, c.Users.VerifyEmail, redirectGuest), true},
{"PATCH", "/account/profile", mw.Auth(a, c.Users.ProfileUpdate, nil), true},
{"PATCH", "/account/password", mw.Auth(a, c.Users.PasswordUpdate, nil), true},
}

3
pkg/server/controllers/users.go
View file

@ -603,7 +603,8 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) {
func (u *Users) VerifyEmail(w http.ResponseWriter, r *http.Request) {
vd := views.Data{}
tokenValue := r.URL.Query().Get("token")
vars := mux.Vars(r)
tokenValue := vars["token"]
if tokenValue == "" {
handleHTMLError(w, r, app.ErrMissingToken, "Missing email verification token", u.EmailVerificationView, vd)

8
pkg/server/controllers/users_test.go
View file

@ -1166,7 +1166,7 @@ func TestVerifyEmail(t *testing.T) {
testutils.MustExec(t, testutils.DB.Save(&tok), "preparing token")
// Execute
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email?token=%s", "someTokenValue"), "")
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "")
res := testutils.HTTPAuthDo(t, req, user)
// Test
@ -1210,7 +1210,7 @@ func TestVerifyEmail(t *testing.T) {
testutils.MustExec(t, testutils.DB.Save(&tok), "preparing token")
// Execute
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email?token=%s", "someTokenValue"), "")
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "")
res := testutils.HTTPAuthDo(t, req, user)
// Test
@ -1253,7 +1253,7 @@ func TestVerifyEmail(t *testing.T) {
testutils.MustExec(t, testutils.DB.Model(&tok).Update("created_at", time.Now().Add(time.Minute*-31)), "Failed to prepare token created_at")
// Execute
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email?token=%s", "someTokenValue"), "")
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "")
res := testutils.HTTPAuthDo(t, req, user)
// Test
@ -1296,7 +1296,7 @@ func TestVerifyEmail(t *testing.T) {
testutils.MustExec(t, testutils.DB.Save(&tok), "preparing token")
// Execute
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email?token=%s", "someTokenValue"), "")
req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "")
res := testutils.HTTPAuthDo(t, req, user)
// Test

2
pkg/server/mailer/templates/src/verify_email.txt
View file

@ -2,7 +2,7 @@ Hi.
Welcome to Dnote! To verify your email, visit the following link:
{{ .WebURL }}/verify-email?token={{ .Token }}
{{ .WebURL }}/verify-email/{{ .Token }}
Thanks for using Dnote.