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

Doc

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-12 16:38:48 +01:00
parent 7315fe723c
commit e468fb687a
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
View file

@ -83,7 +83,7 @@ func CreateInvitesFrom3PIDInvites(
} }
} }
// // ExchangeThirdPartyInvite implements PUT /_matrix/federation/v1/exchange_third_party_invite/{roomID}
func ExchangeThirdPartyInvite( func ExchangeThirdPartyInvite(
httpReq *http.Request, httpReq *http.Request,
request *gomatrixserverlib.FederationRequest, request *gomatrixserverlib.FederationRequest,
@ -109,6 +109,7 @@ func ExchangeThirdPartyInvite(
} }
} }
// Auth and build the event from what the remote server sent us
event, err := buildMembershipEvent(&builder, queryAPI, cfg) event, err := buildMembershipEvent(&builder, queryAPI, cfg)
if err == errNotInRoom { if err == errNotInRoom {
return util.JSONResponse{ return util.JSONResponse{
@ -117,11 +118,14 @@ func ExchangeThirdPartyInvite(
} }
} }
// Ask the requesting server to sign the newly created event so we know it
// acknowledged it
signedEvent, err := federation.SendInvite(request.Origin(), *event) signedEvent, err := federation.SendInvite(request.Origin(), *event)
if err != nil { if err != nil {
return httputil.LogThenError(httpReq, err) return httputil.LogThenError(httpReq, err)
} }
// Send the event to the roomserver
if err = producer.SendInvite(signedEvent.Event); err != nil { if err = producer.SendInvite(signedEvent.Event); err != nil {
return httputil.LogThenError(httpReq, err) return httputil.LogThenError(httpReq, err)
} }
@ -168,6 +172,11 @@ func createInviteFrom3PIDInvite(
return event, nil return event, nil
} }
// buildMembershipEvent uses a builder for a m.room.member invite event derived
// from a third-party invite to auth and build the said event. Returns the said
// event.
// Returns errNotInRoom if the server is not in the room the invite is for.
// Returns an error if something failed during the process.
func buildMembershipEvent( func buildMembershipEvent(
builder *gomatrixserverlib.EventBuilder, queryAPI api.RoomserverQueryAPI, builder *gomatrixserverlib.EventBuilder, queryAPI api.RoomserverQueryAPI,
cfg config.Dendrite, cfg config.Dendrite,