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

Added error status codes

Browse source
This commit is contained in:
Parminder Singh 2019-07-27 21:53:10 +05:30
parent 0973dfc4d6
commit bf99e3677b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/auth_fallback.go
View file

@ -109,6 +109,7 @@ func AuthFallback(
sessionID := req.URL.Query().Get("session") sessionID := req.URL.Query().Get("session")
if sessionID == "" { if sessionID == "" {
w.WriteHeader(http.StatusBadRequest)
_, err := w.Write([]byte("Session ID not provided")) _, err := w.Write([]byte("Session ID not provided"))
if err != nil { if err != nil {
res := httputil.LogThenError(req, err) res := httputil.LogThenError(req, err)
@ -135,6 +136,7 @@ func AuthFallback(
// Handle Recaptcha // Handle Recaptcha
if authType == authtypes.LoginTypeRecaptcha { if authType == authtypes.LoginTypeRecaptcha {
if cfg.Matrix.RecaptchaPublicKey == "" { if cfg.Matrix.RecaptchaPublicKey == "" {
w.WriteHeader(http.StatusInternalServerError)
_, err := w.Write([]byte("This Homeserver doesn't have a recaptcha public key")) _, err := w.Write([]byte("This Homeserver doesn't have a recaptcha public key"))
if err != nil { if err != nil {
res := httputil.LogThenError(req, err) res := httputil.LogThenError(req, err)

2
clientapi/routing/routing.go
View file

@ -241,7 +241,7 @@ func Setup(
vars := mux.Vars(req) vars := mux.Vars(req)
return AuthFallback(w, req, vars["authType"], cfg) return AuthFallback(w, req, vars["authType"], cfg)
}), }),
).Methods("GET", "POST", "OPTIONS") ).Methods(http.MethodGet, http.MethodPost, http.MethodOptions)
r0mux.Handle("/pushrules/", r0mux.Handle("/pushrules/",
common.MakeExternalAPI("push_rules", func(req *http.Request) util.JSONResponse { common.MakeExternalAPI("push_rules", func(req *http.Request) util.JSONResponse {