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

Remove join response structure

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-29 14:24:44 +01:00
parent 46a8feaf1b
commit 62210741ce
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/github.com/matrix-org/dendrite/clientapi/thirdpartyinvites/thirdpartyinvites.go
View file

@ -48,13 +48,6 @@ type MembershipRequest struct {
Address string `json:"address"` Address string `json:"address"`
} }
// idServerResponses is a structure containing the representation of the responses
// for two requests on an identity server: one on /lookup and one on /store-invite
type idServerResponses struct {
Lookup *idServerLookupResponse
StoreInvite *idServerStoreInviteResponse
}
// idServerLookupResponse represents the response described at https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-identity-api-v1-lookup // idServerLookupResponse represents the response described at https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-identity-api-v1-lookup
type idServerLookupResponse struct { type idServerLookupResponse struct {
TS int64 `json:"ts"` TS int64 `json:"ts"`
@ -105,17 +98,17 @@ func CheckAndProcess(
} }
} }
resp, err := queryIDServer(req, db, cfg, device, body, roomID) lookupRes, storeInviteRes, err := queryIDServer(req, db, cfg, device, body, roomID)
if err != nil { if err != nil {
resErr := httputil.LogThenError(req, err) resErr := httputil.LogThenError(req, err)
return &resErr return &resErr
} }
if resp.Lookup.MXID == "" { if lookupRes.MXID == "" {
// No Matrix ID could be found for this 3PID, meaning that a // No Matrix ID could be found for this 3PID, meaning that a
// "m.room.third_party_invite" have to be emitted from the data in // "m.room.third_party_invite" have to be emitted from the data in
// resp.StoreInvite. // storeInviteRes.
err = emit3PIDInviteEvent(body, resp.StoreInvite, device, roomID, cfg, queryAPI, producer) err = emit3PIDInviteEvent(body, storeInviteRes, device, roomID, cfg, queryAPI, producer)
if err == events.ErrRoomNoExists { if err == events.ErrRoomNoExists {
return &util.JSONResponse{ return &util.JSONResponse{
Code: 404, Code: 404,
@ -135,7 +128,7 @@ func CheckAndProcess(
// A Matrix ID have been found: set it in the body request and let the process // A Matrix ID have been found: set it in the body request and let the process
// continue to create a "m.room.member" event with an "invite" membership // continue to create a "m.room.member" event with an "invite" membership
body.UserID = resp.Lookup.MXID body.UserID = lookupRes.MXID
return nil return nil
} }
@ -152,18 +145,17 @@ func CheckAndProcess(
func queryIDServer( func queryIDServer(
req *http.Request, db *accounts.Database, cfg config.Dendrite, req *http.Request, db *accounts.Database, cfg config.Dendrite,
device *authtypes.Device, body *MembershipRequest, roomID string, device *authtypes.Device, body *MembershipRequest, roomID string,
) (res *idServerResponses, err error) { ) (lookupRes *idServerLookupResponse, storeInviteRes *idServerStoreInviteResponse, err error) {
res = new(idServerResponses)
// Lookup the 3PID // Lookup the 3PID
res.Lookup, err = queryIDServerLookup(body) lookupRes, err = queryIDServerLookup(body)
if err != nil { if err != nil {
return return
} }
if res.Lookup.MXID == "" { if lookupRes.MXID == "" {
// No Matrix ID matches with the given 3PID, ask the server to store the // No Matrix ID matches with the given 3PID, ask the server to store the
// invite and return a token // invite and return a token
res.StoreInvite, err = queryIDServerStoreInvite(db, cfg, device, body, roomID) storeInviteRes, err = queryIDServerStoreInvite(db, cfg, device, body, roomID)
return return
} }
@ -171,14 +163,14 @@ func queryIDServer(
// Get timestamp in milliseconds to compare it with the timestamps provided // Get timestamp in milliseconds to compare it with the timestamps provided
// by the identity server // by the identity server
now := time.Now().UnixNano() / 1000000 now := time.Now().UnixNano() / 1000000
if res.Lookup.NotBefore > now || now > res.Lookup.NotAfter { if lookupRes.NotBefore > now || now > lookupRes.NotAfter {
// If the current timestamp isn't in the time frame in which the association // If the current timestamp isn't in the time frame in which the association
// is known to be valid, re-run the query // is known to be valid, re-run the query
return queryIDServer(req, db, cfg, device, body, roomID) return queryIDServer(req, db, cfg, device, body, roomID)
} }
// Check the request signatures and send an error if one isn't valid // Check the request signatures and send an error if one isn't valid
if err = checkIDServerSignatures(body, res.Lookup); err != nil { if err = checkIDServerSignatures(body, lookupRes); err != nil {
return return
} }