mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'cf5282d83e1a9a8674371ccbd476c317b37edef5'

Browse source
This commit is contained in:
Brian Meek 2022-09-03 09:46:51 -07:00
parent 1a917db361 cf5282d83e
commit 64e3b76353
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clientapi/auth/login.go
View file

@ -18,7 +18,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/clientapi/auth/authtypes"
@ -42,7 +41,7 @@ func LoginFromJSONReader(
userInteractiveAuth *UserInteractive, userInteractiveAuth *UserInteractive,
cfg *config.ClientAPI, cfg *config.ClientAPI,
) (*Login, LoginCleanupFunc, *util.JSONResponse) { ) (*Login, LoginCleanupFunc, *util.JSONResponse) {
reqBytes, err := ioutil.ReadAll(r) reqBytes, err := io.ReadAll(r)
if err != nil { if err != nil {
err := &util.JSONResponse{ err := &util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,