mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-14 05:12:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' of github.com:element-hq/dendrite into msc3861

Browse source
This commit is contained in:
Roman Isaev 2025-01-17 02:55:30 +00:00
commit 6833e99558
No known key found for this signature in database
GPG key ID: 7BE2B6A6C89AEC7F
22 changed files with 519 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/routing.go
View file

@ -1492,7 +1492,7 @@ func Setup(
// Cross-signing device keys
postDeviceSigningKeys := httputil.MakeAuthAPI("post_device_signing_keys", userVerifier, func(req *http.Request, device *userapi.Device) util.JSONResponse {
return UploadCrossSigningDeviceKeys(req, userInteractiveAuth, userAPI, device, userAPI, cfg)
return UploadCrossSigningDeviceKeys(req, userAPI, device, userAPI.QueryAccountByPassword, cfg)
})
postDeviceSigningSignatures := httputil.MakeAuthAPI("post_device_signing_signatures", userVerifier, func(req *http.Request, device *userapi.Device) util.JSONResponse {