Merge commit 'cf5282d83e1a9a8674371ccbd476c317b37edef5'

This commit is contained in:
Brian Meek 2022-09-03 09:46:51 -07:00
commit 64e3b76353

View file

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