Fix guest -> real account upgrade with account validity enabled (#6359)

matrix-org · Nov 14, 2019 · 745a486 · 745a486
1 parent 6e1b40d
commit 745a486
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/changelog.d/6359.bugfix b/changelog.d/6359.bugfix
@@ -0,0 +1 @@
+Fix bug where upgrading a guest account to a full user would fail when account validity is enabled.
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
@@ -361,14 +361,11 @@ def set_expiration_date_for_user_txn(self, txn, user_id, use_delta=False):
                 expiration_ts,
             )
 
-        self._simple_insert_txn(
+        self._simple_upsert_txn(
             txn,
             "account_validity",
-            values={
-                "user_id": user_id,
-                "expiration_ts_ms": expiration_ts,
-                "email_sent": False,
-            },
+            keyvalues={"user_id": user_id},
+            values={"expiration_ts_ms": expiration_ts, "email_sent": False},
         )
 
     def start_profiling(self):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug where upgrading a guest account to a full user would fail when account validity is enabled.