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

Send IDs over to keyserver internal API

Browse source
This commit is contained in:
Neil Alexander 2021-02-26 10:53:53 +00:00
parent f999e58a6f
commit faffc1be3c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clientapi/routing/keys.go
View file

@ -38,7 +38,10 @@ func UploadKeys(req *http.Request, keyAPI api.KeyInternalAPI, device *userapi.De
return *resErr return *resErr
} }
uploadReq := &api.PerformUploadKeysRequest{} uploadReq := &api.PerformUploadKeysRequest{
DeviceID: device.ID,
UserID: device.UserID,
}
if r.DeviceKeys != nil { if r.DeviceKeys != nil {
uploadReq.DeviceKeys = []api.DeviceKeys{ uploadReq.DeviceKeys = []api.DeviceKeys{
{ {

4
keyserver/internal/internal.go
View file

@ -520,7 +520,9 @@ func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.Perform
Err: fmt.Sprintf("a.DB.OneTimeKeysCount: %s", err), Err: fmt.Sprintf("a.DB.OneTimeKeysCount: %s", err),
} }
} }
res.OneTimeKeyCounts = append(res.OneTimeKeyCounts, *counts) if counts != nil {
res.OneTimeKeyCounts = append(res.OneTimeKeyCounts, *counts)
}
return return
} }
for _, key := range req.OneTimeKeys { for _, key := range req.OneTimeKeys {