From 674e7d5b7b78bce393975fc00440efecdfa02929 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Tue, 23 Nov 2021 01:16:43 +0100 Subject: [PATCH 1/2] Implement Well-Known URL for password change Fixes #11804 --- routers/web/web.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routers/web/web.go b/routers/web/web.go index ebced6942fc0..9bc4b9662751 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -236,6 +236,10 @@ func RegisterRoutes(m *web.Route) { if setting.Federation.Enabled { m.Get("/.well-known/nodeinfo", NodeInfoLinks) } + m.Get("/.well-known/change-password", func(w http.ResponseWriter, req *http.Request) { + http.Redirect(w, req, "/user/settings/account", http.StatusTemporaryRedirect) + }) + m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/explore/repos") From ed629c57d9597bf902a22b76d57d9ea0eda1ff04 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Wed, 24 Nov 2021 09:12:16 +0100 Subject: [PATCH 2/2] Refactor the routes in a /.well-known group --- routers/web/web.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index 9bc4b9662751..a642fdea5eba 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -232,12 +232,14 @@ func RegisterRoutes(m *web.Route) { // Routers. // for health check m.Get("/", Home) - m.Get("/.well-known/openid-configuration", user.OIDCWellKnown) - if setting.Federation.Enabled { - m.Get("/.well-known/nodeinfo", NodeInfoLinks) - } - m.Get("/.well-known/change-password", func(w http.ResponseWriter, req *http.Request) { - http.Redirect(w, req, "/user/settings/account", http.StatusTemporaryRedirect) + m.Group("/.well-known", func() { + m.Get("/openid-configuration", user.OIDCWellKnown) + if setting.Federation.Enabled { + m.Get("/nodeinfo", NodeInfoLinks) + } + m.Get("/change-password", func(w http.ResponseWriter, req *http.Request) { + http.Redirect(w, req, "/user/settings/account", http.StatusTemporaryRedirect) + }) }) m.Group("/explore", func() {