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

Structure for 3PID invite

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-24 14:55:45 +01:00
parent 9c954501a2
commit d28fa944a1
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/github.com/matrix-org/dendrite/clientapi/writers/membership.go
View file

@ -31,6 +31,14 @@ import (
"github.com/matrix-org/util" "github.com/matrix-org/util"
) )
type requestBody struct {
UserID string `json:"user_id"`
Reason string `json:"reason"`
IDServer string `json:"id_server"`
Medium string `json:"medium"`
Address string `json:"address"`
}
// SendMembership implements PUT /rooms/{roomID}/(join|kick|ban|unban|leave|invite) // SendMembership implements PUT /rooms/{roomID}/(join|kick|ban|unban|leave|invite)
// by building a m.room.member event then sending it to the room server // by building a m.room.member event then sending it to the room server
func SendMembership( func SendMembership(
@ -38,7 +46,12 @@ func SendMembership(
roomID string, membership string, cfg config.Dendrite, roomID string, membership string, cfg config.Dendrite,
queryAPI api.RoomserverQueryAPI, producer *producers.RoomserverProducer, queryAPI api.RoomserverQueryAPI, producer *producers.RoomserverProducer,
) util.JSONResponse { ) util.JSONResponse {
stateKey, reason, reqErr := getMembershipStateKey(req, device, membership) var body requestBody
if reqErr := httputil.UnmarshalJSONRequest(req, &body); reqErr != nil {
return *reqErr
}
stateKey, reason, reqErr := getMembershipStateKey(body, device, membership)
if reqErr != nil { if reqErr != nil {
return *reqErr return *reqErr
} }
@ -107,22 +120,13 @@ func SendMembership(
// In the latter case, if there was an issue retrieving the user ID from the request body, // In the latter case, if there was an issue retrieving the user ID from the request body,
// returns a JSONResponse with a corresponding error code and message. // returns a JSONResponse with a corresponding error code and message.
func getMembershipStateKey( func getMembershipStateKey(
req *http.Request, device *authtypes.Device, membership string, body requestBody, device *authtypes.Device, membership string,
) (stateKey string, reason string, response *util.JSONResponse) { ) (stateKey string, reason string, response *util.JSONResponse) {
if membership == "ban" || membership == "unban" || membership == "kick" || membership == "invite" { if membership == "ban" || membership == "unban" || membership == "kick" || membership == "invite" {
// If we're in this case, the state key is contained in the request body, // If we're in this case, the state key is contained in the request body,
// possibly along with a reason (for "kick" and "ban") so we need to parse // possibly along with a reason (for "kick" and "ban") so we need to parse
// it // it
var requestBody struct { if body.UserID == "" {
UserID string `json:"user_id"`
Reason string `json:"reason"`
}
if reqErr := httputil.UnmarshalJSONRequest(req, &requestBody); reqErr != nil {
response = reqErr
return
}
if requestBody.UserID == "" {
response = &util.JSONResponse{ response = &util.JSONResponse{
Code: 400, Code: 400,
JSON: jsonerror.BadJSON("'user_id' must be supplied."), JSON: jsonerror.BadJSON("'user_id' must be supplied."),
@ -130,8 +134,8 @@ func getMembershipStateKey(
return return
} }
stateKey = requestBody.UserID stateKey = body.UserID
reason = requestBody.Reason reason = body.Reason
} else { } else {
stateKey = device.UserID stateKey = device.UserID
} }