Ensure that the guest user is in the database when upgrading accounts

2016-07-08 15:15:55 +01:00 · 2016-07-08 15:15:55 +01:00 · 10c843fcfb
commit 10c843fcfb
parent 58930da52b
1 changed files with 13 additions and 0 deletions
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@ -127,11 +127,24 @@ class RegistrationStore(SQLBaseStore):

        try:
            if was_guest:
+                # Ensure that the guest user actually exists
+                self._simple_select_one_txn(
+                    txn,
+                    "users",
+                    keyvalues={
+                        "name": user_id,
+                        "is_guest": 1,
+                    },
+                    retcols=("name",),
+                    allow_none=False,
+                )
+
                self._simple_update_one_txn(
                    txn,
                    "users",
                    keyvalues={
                        "name": user_id,
+                        "is_guest": 1,
                    },
                    updatevalues={
                        "password_hash": password_hash,