diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/sync.go b/src/github.com/matrix-org/dendrite/clientapi/readers/sync.go index 27a470945..b733a3dbc 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/readers/sync.go +++ b/src/github.com/matrix-org/dendrite/clientapi/readers/sync.go @@ -3,13 +3,22 @@ package readers import ( "net/http" + "github.com/matrix-org/dendrite/clientapi/auth" "github.com/matrix-org/util" ) // Sync implements /sync func Sync(req *http.Request) (interface{}, *util.HTTPError) { logger := util.GetLogger(req.Context()) - logger.Info("Doing stuff...") + userID, err := auth.VerifyAccessToken(req) + if err != nil { + return nil, &util.HTTPError{ + Code: 403, + JSON: err, + } + } + + logger.WithField("userID", userID).Info("Doing stuff...") return nil, &util.HTTPError{ Code: 404, Message: "Not implemented yet", diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go b/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go index 11b17740d..c5d2c8340 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go +++ b/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go @@ -3,13 +3,26 @@ package writers import ( "net/http" + log "github.com/Sirupsen/logrus" + "github.com/matrix-org/dendrite/clientapi/auth" "github.com/matrix-org/util" ) // SendMessage implements /rooms/{roomID}/send/{eventType} func SendMessage(req *http.Request, roomID, eventType string) (interface{}, *util.HTTPError) { logger := util.GetLogger(req.Context()) - logger.WithField("roomID", roomID).WithField("eventType", eventType).Info("Doing stuff...") + userID, err := auth.VerifyAccessToken(req) + if err != nil { + return nil, &util.HTTPError{ + Code: 403, + JSON: err, + } + } + logger.WithFields(log.Fields{ + "roomID": roomID, + "eventType": eventType, + "userID": userID, + }).Info("Doing stuff...") return nil, &util.HTTPError{ Code: 404, Message: "Not implemented yet",