From ee3a21a537a9633c108d5f1f32b5bd566f41845d Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 12 Apr 2022 05:06:07 +0200 Subject: [PATCH] Fix middleware function's placements for `/user/...` (#19377) (#19378) - Backport #19377 - Add reqSignIn to `/user/task/{task}` as it specific to a logged in user currently not-logged in user could cause a NPE. - Remove `/user/active` reqSignIn middleware, because when you want to active a account you're not "signed in" so it doesn't make sense to add that middleware. --- routers/web/web.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index d3b891ce31..e18ed8f8ee 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -374,8 +374,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/user", func() { // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) - m.Get("/activate", auth.Activate, reqSignIn) - m.Post("/activate", auth.ActivatePost, reqSignIn) + m.Get("/activate", auth.Activate) + m.Post("/activate", auth.ActivatePost) m.Any("/activate_email", auth.ActivateEmail) m.Get("/avatar/{username}/{size}", user.AvatarByUserName) m.Get("/recover_account", auth.ResetPasswd) @@ -383,7 +383,7 @@ func RegisterRoutes(m *web.Route) { m.Get("/forgot_password", auth.ForgotPasswd) m.Post("/forgot_password", auth.ForgotPasswdPost) m.Post("/logout", auth.SignOut) - m.Get("/task/{task}", user.TaskStatus) + m.Get("/task/{task}", reqSignIn, user.TaskStatus) }) // ***** END: User *****