From 22dac0b77583d5eaf99a8fac85f4dcc72e299cbc Mon Sep 17 00:00:00 2001 From: cassiozareck Date: Wed, 26 Jul 2023 16:08:12 -0300 Subject: [PATCH 1/2] Fix non-redirect login issue Signed-off-by: cassiozareck --- routers/web/web.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/web/web.go b/routers/web/web.go index 6d5ccad484fa0..c41c228ccf59c 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -374,9 +374,12 @@ func registerRoutes(m *web.Route) { m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones) // ***** START: User ***** + // Group without signOut required to allow logged-in users to access this route for redirection purposes m.Group("/user", func() { m.Get("/login", auth.SignIn) m.Post("/login", web.Bind(forms.SignInForm{}), auth.SignInPost) + }) + m.Group("/user", func() { m.Group("", func() { m.Combo("/login/openid"). Get(auth.SignInOpenID). From 8ce9059a26ae35e62ef9da45433a4b5d47807d7d Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Jul 2023 11:21:23 +0800 Subject: [PATCH 2/2] Update web.go --- routers/web/web.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index c41c228ccf59c..d7ef2fb82f229 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -374,12 +374,10 @@ func registerRoutes(m *web.Route) { m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones) // ***** START: User ***** - // Group without signOut required to allow logged-in users to access this route for redirection purposes + // "user/login" doesn't need signOut, then logged-in users can still access this route for redirection purposes by "/user/login?redirec_to=..." + m.Get("/user/login", auth.SignIn) m.Group("/user", func() { - m.Get("/login", auth.SignIn) m.Post("/login", web.Bind(forms.SignInForm{}), auth.SignInPost) - }) - m.Group("/user", func() { m.Group("", func() { m.Combo("/login/openid"). Get(auth.SignInOpenID).