From d2906fe6667d3384f37ef03ca87172d643d49587 Mon Sep 17 00:00:00 2001
From: Manuel Stahl <37705355+awesome-manuel@users.noreply.github.com>
Date: Thu, 9 Jan 2020 14:31:00 +0100
Subject: Allow admin users to create or modify users without a shared secret
 (#6495)

Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
---
 synapse/storage/data_stores/main/registration.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'synapse/storage')

diff --git a/synapse/storage/data_stores/main/registration.py b/synapse/storage/data_stores/main/registration.py
index 5e8ecac0ea..cb4b2b39a0 100644
--- a/synapse/storage/data_stores/main/registration.py
+++ b/synapse/storage/data_stores/main/registration.py
@@ -52,11 +52,13 @@ class RegistrationWorkerStore(SQLBaseStore):
                 "name",
                 "password_hash",
                 "is_guest",
+                "admin",
                 "consent_version",
                 "consent_server_notice_sent",
                 "appservice_id",
                 "creation_ts",
                 "user_type",
+                "deactivated",
             ],
             allow_none=True,
             desc="get_user_by_id",
-- 
cgit 1.4.1