From 419cb8a1adeffbe908904f67ca155291cacd0da1 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 2 Mar 2021 11:15:14 +0000 Subject: [PATCH] Fix user API call --- keyserver/api/api.go | 4 ++-- userapi/internal/api.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keyserver/api/api.go b/keyserver/api/api.go index d1e93e1f7..5cb287bc1 100644 --- a/keyserver/api/api.go +++ b/keyserver/api/api.go @@ -108,8 +108,8 @@ type OneTimeKeysCount struct { // PerformUploadKeysRequest is the request to PerformUploadKeys type PerformUploadKeysRequest struct { - UserID string // User performing the request - DeviceID string // Device performing the request + UserID string // Required - User performing the request + DeviceID string // Optional - Device performing the request, for fetching OTK count DeviceKeys []DeviceKeys OneTimeKeys []OneTimeKeys // OnlyDisplayNameUpdates should be `true` if ALL the DeviceKeys are present to update diff --git a/userapi/internal/api.go b/userapi/internal/api.go index dce8b5051..4abf908d4 100644 --- a/userapi/internal/api.go +++ b/userapi/internal/api.go @@ -218,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,