diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-03-02 11:40:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 11:40:20 +0000 |
| commit | 81312b8a787c9a25ce897f361ba7720cdc763e9e (patch) | |
| tree | b3cfd43e6485628bd821a1cf948eaf87f0647e9a /userapi | |
| parent | f5cf2418776f0117455eb4156eabdc6dbcf9c1ee (diff) | |
Return the current OTK count on an empty upload request (#1774)
* Always return OTK counts
* Fix parameter ordering
* Send IDs over to keyserver internal API
* Review comments
* Fix syntax error
* Fix panic, hopefully
* Require user ID to be set
* Fix user API call
Diffstat (limited to 'userapi')
| -rw-r--r-- | userapi/internal/api.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/userapi/internal/api.go b/userapi/internal/api.go index d8af5433..4abf908d 100644 --- a/userapi/internal/api.go +++ b/userapi/internal/api.go @@ -161,6 +161,7 @@ func (a *UserInternalAPI) deviceListUpdate(userID string, deviceIDs []string) er var uploadRes keyapi.PerformUploadKeysResponse a.KeyAPI.PerformUploadKeys(context.Background(), &keyapi.PerformUploadKeysRequest{ + UserID: userID, DeviceKeys: deviceKeys, }, &uploadRes) if uploadRes.Error != nil { @@ -217,6 +218,7 @@ func (a *UserInternalAPI) PerformDeviceUpdate(ctx context.Context, req *api.Perf // display name has changed: update the device key var uploadRes keyapi.PerformUploadKeysResponse a.KeyAPI.PerformUploadKeys(context.Background(), &keyapi.PerformUploadKeysRequest{ + UserID: req.RequestingUserID, DeviceKeys: []keyapi.DeviceKeys{ { DeviceID: dev.ID, |