From 773d5bb9f99a6cc36d284a2fbea933f8d9e7753b Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 15 May 2020 12:07:51 +0100
Subject: [PATCH] Return user_id and stream_id in federated devices query
 (#1040)

---
 federationapi/routing/devices.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go
index 01647a61e..49686c761 100644
--- a/federationapi/routing/devices.go
+++ b/federationapi/routing/devices.go
@@ -23,7 +23,9 @@ import (
 )
 
 type userDevicesResponse struct {
-	Devices []authtypes.Device `json:"devices"`
+	UserID   string             `json:"user_id"`
+	StreamID int                `json:"stream_id"`
+	Devices  []authtypes.Device `json:"devices"`
 }
 
 // GetUserDevices for the given user id
@@ -48,6 +50,12 @@ func GetUserDevices(
 
 	return util.JSONResponse{
 		Code: 200,
-		JSON: userDevicesResponse{devs},
+		// TODO: we should return an incrementing stream ID each time the device
+		// list changes for delta changes to be recognised
+		JSON: userDevicesResponse{
+			UserID:   userID,
+			StreamID: 0,
+			Devices:  devs,
+		},
 	}
 }