From 526bc33e023e9a588c1b96e500c15baf90c022fb Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Wed, 2 Dec 2015 17:27:49 +0000
Subject: Fix implementation of /admin/whois

---
 synapse/handlers/admin.py | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'synapse/handlers/admin.py')

diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
index d852a18555..5ba3c7039a 100644
--- a/synapse/handlers/admin.py
+++ b/synapse/handlers/admin.py
@@ -30,33 +30,27 @@ class AdminHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def get_whois(self, user):
-        res = yield self.store.get_user_ip_and_agents(user)
-
-        d = {}
-        for r in res:
-            # Note that device_id is always None
-            device = d.setdefault(r["device_id"], {})
-            session = device.setdefault(r["access_token"], [])
-            session.append({
-                "ip": r["ip"],
-                "user_agent": r["user_agent"],
-                "last_seen": r["last_seen"],
+        connections = []
+
+        sessions = yield self.store.get_user_ip_and_agents(user)
+        for session in sessions:
+            connections.append({
+                "ip": session["ip"],
+                "last_seen": session["last_seen"],
+                "user_agent": session["user_agent"],
             })
 
         ret = {
             "user_id": user.to_string(),
             "devices": [
                 {
-                    "device_id": k,
+                    "device_id": None,
                     "sessions": [
                         {
-                            # "access_token": x, TODO (erikj)
-                            "connections": y,
+                            "connections": connections,
                         }
-                        for x, y in v.items()
                     ]
-                }
-                for k, v in d.items()
+                },
             ],
         }
 
-- 
cgit 1.4.1


From edfcb83473fa4af4ecd34884c780774aa5c5184a Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Thu, 3 Dec 2015 16:19:21 +0000
Subject: Flatten devices into a dict, not a list

---
 synapse/handlers/admin.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'synapse/handlers/admin.py')

diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
index 5ba3c7039a..04fa58df65 100644
--- a/synapse/handlers/admin.py
+++ b/synapse/handlers/admin.py
@@ -42,16 +42,15 @@ class AdminHandler(BaseHandler):
 
         ret = {
             "user_id": user.to_string(),
-            "devices": [
-                {
-                    "device_id": None,
+            "devices": {
+                "": {
                     "sessions": [
                         {
                             "connections": connections,
                         }
                     ]
                 },
-            ],
+            },
         }
 
         defer.returnValue(ret)
-- 
cgit 1.4.1