Add a config option to disable deleting tokens on bind

changelog.d/293.feature

@@ -0,0 +1 @@
+Add a config option to disable deleting invite tokens on bind.

sydent/sydent.py

@@ -92,6 +92,7 @@
 
         # Whether clients and homeservers can register an association using v1 endpoints.
         'enable_v1_associations': 'true',
+        'delete_tokens_on_bind': 'true',
     },
     'db': {
         'db.file': 'sydent.db',
@@ -176,6 +177,10 @@ def __init__(self, cfg, reactor=twisted.internet.reactor):
             self.cfg.get("general", "enable_v1_associations")
         )
 
+        self.delete_tokens_on_bind = parse_cfg_bool(
+            self.cfg.get("general", "delete_tokens_on_bind")
+        )
+
         # See if a pepper already exists in the database
         # Note: This MUST be run before we start serving requests, otherwise lookups for
         # 3PID hashes may come in before we've completed generating them

sydent/threepid/bind.py

@@ -160,6 +160,10 @@ def _notify(self, assoc, attempt):
         else:
             logger.info("Successfully notified on bind for %s" % (mxid,))
 
+            # Skip the deletion step if instructed so by the config.
+            if not self.sydent.delete_tokens_on_bind:
+                return
+
             # Only remove sent tokens when they've been successfully sent.
             try:
                 joinTokenStore = JoinTokenStore(self.sydent)