mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the wrong regex for endpoint

Browse source
This commit is contained in:
Parminder Singh 2018-03-10 13:31:55 +05:30
parent b2bb813020
commit 55552050c6
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/github.com/matrix-org/dendrite/clientapi/routing/auth_fallback.go
View file

@ -101,9 +101,10 @@ func ServeTemplate(w http.ResponseWriter, templateHTML string, data map[string]s
// AuthFallback implements GET on /auth/{authType}/fallback/web?session={sessionID} // AuthFallback implements GET on /auth/{authType}/fallback/web?session={sessionID}
func AuthFallback( func AuthFallback(
w http.ResponseWriter, req *http.Request, authType string, sessionID string, w http.ResponseWriter, req *http.Request, authType string,
cfg config.Dendrite, cfg config.Dendrite,
) *util.JSONResponse { ) *util.JSONResponse {
sessionID := req.Form.Get("session")
ServeRecaptcha := func() { ServeRecaptcha := func() {
data := map[string]string{ data := map[string]string{
"MyUrl": req.URL.String(), "MyUrl": req.URL.String(),

4
src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
View file

@ -174,10 +174,10 @@ func Setup(
}), }),
).Methods("GET", "POST", "OPTIONS") ).Methods("GET", "POST", "OPTIONS")
r0mux.Handle("/auth/{authType}/fallback/web?session={sessionID}", r0mux.Handle("/auth/{authType}/fallback/web",
common.MakeHTMLAPI("authfallback", func(w http.ResponseWriter, req *http.Request) *util.JSONResponse { common.MakeHTMLAPI("authfallback", func(w http.ResponseWriter, req *http.Request) *util.JSONResponse {
vars := mux.Vars(req) vars := mux.Vars(req)
return AuthFallback(w, req, vars["authType"], vars["sessionID"], cfg) return AuthFallback(w, req, vars["authType"], cfg)
}), }),
).Methods("GET", "POST", "OPTIONS") ).Methods("GET", "POST", "OPTIONS")