From 42a394caa2884096e5afe1f1c2c75680792769d8 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Tue, 21 Aug 2018 14:51:34 -0400
Subject: [PATCH] allow session_data to be any JSON instead of just a string

---
 synapse/storage/e2e_room_keys.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index c7b1fad21..b695570a7 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -58,6 +58,8 @@ class EndToEndRoomKeyStore(SQLBaseStore):
             desc="get_e2e_room_key",
         )
 
+        row["session_data"] = json.loads(row["session_data"]);
+
         defer.returnValue(row)
 
     @defer.inlineCallbacks
@@ -87,7 +89,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
                 "first_message_index": room_key['first_message_index'],
                 "forwarded_count": room_key['forwarded_count'],
                 "is_verified": room_key['is_verified'],
-                "session_data": room_key['session_data'],
+                "session_data": json.dumps(room_key['session_data']),
             },
             lock=False,
         )
@@ -145,7 +147,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
                 "first_message_index": row["first_message_index"],
                 "forwarded_count": row["forwarded_count"],
                 "is_verified": row["is_verified"],
-                "session_data": row["session_data"],
+                "session_data": json.loads(row["session_data"]),
             }
 
         defer.returnValue(sessions)