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

a slight change to match master auth.Data

Browse source
This commit is contained in:
terrill 2018-07-27 11:20:02 +08:00
parent a8a6422d50
commit 9c36971b11
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/encryptoapi/routing/routing.go
View file

@ -35,30 +35,30 @@ func Setup(
encryptionDB *storage.Database, encryptionDB *storage.Database,
deviceDB *devices.Database, deviceDB *devices.Database,
) { ) {
dataDB := auth.DeviceDatabase(deviceDB) authData := auth.Data{nil, deviceDB, nil}
unstablemux := apiMux.PathPrefix(pathPrefixUnstable).Subrouter() unstablemux := apiMux.PathPrefix(pathPrefixUnstable).Subrouter()
unstablemux.Handle("/keys/upload/{deviceID}", unstablemux.Handle("/keys/upload/{deviceID}",
common.MakeAuthAPI("upload keys", dataDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse { common.MakeAuthAPI("upload keys", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
return UploadPKeys(req, encryptionDB, device.UserID, device.ID) return UploadPKeys(req, encryptionDB, device.UserID, device.ID)
}), }),
).Methods(http.MethodPost, http.MethodOptions) ).Methods(http.MethodPost, http.MethodOptions)
unstablemux.Handle("/keys/upload", unstablemux.Handle("/keys/upload",
common.MakeAuthAPI("upload keys", dataDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse { common.MakeAuthAPI("upload keys", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
return UploadPKeys(req, encryptionDB, device.UserID, device.ID) return UploadPKeys(req, encryptionDB, device.UserID, device.ID)
}), }),
).Methods(http.MethodPost, http.MethodOptions) ).Methods(http.MethodPost, http.MethodOptions)
unstablemux.Handle("/keys/query", unstablemux.Handle("/keys/query",
common.MakeAuthAPI("query keys", dataDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse { common.MakeAuthAPI("query keys", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
//vars := mux.Vars(req) //vars := mux.Vars(req)
return QueryPKeys(req, encryptionDB, device.ID, deviceDB) return QueryPKeys(req, encryptionDB, device.ID, deviceDB)
}), }),
).Methods(http.MethodPost, http.MethodOptions) ).Methods(http.MethodPost, http.MethodOptions)
unstablemux.Handle("/keys/claim", unstablemux.Handle("/keys/claim",
common.MakeAuthAPI("claim keys", dataDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse { common.MakeAuthAPI("claim keys", authData, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
return ClaimOneTimeKeys(req, encryptionDB) return ClaimOneTimeKeys(req, encryptionDB)
}), }),
).Methods(http.MethodPost, http.MethodOptions) ).Methods(http.MethodPost, http.MethodOptions)