implement user reactivate

synadm/api.py

@@ -668,9 +668,12 @@ def user_reactivate(self, user_id, password=None):
             password (str or None): A password. Required under certain
                 conditions.
         """
-        # TODO
-        # TODO: handling errors when password is required?
-        pass
+        data = {
+            "deactivated": False
+        }
+        if password != None:
+            data["password"] = password
+        return self._user_modify_api(user_id, data)
 
     def user_set_lock(self, user_id, locked):
         """

synadm/cli/user.py

@@ -558,12 +558,14 @@ def set_display_name(helper, user_id, display_name):
 
 @user.command()
 @click.argument("user_id", type=str)
+# TODO: check compatibility with --batch
+@click.password_option(required=False,
+help="""The new password to set to. This is required when reactivating a
+user on a Synapse installation with passwords enabled.""")
 @click.pass_obj
-def reactivate(helper, user_id):
-    # TODO
-    # TODO: does this require a password? merge into password? user
-    # experience?
-    pass
+def reactivate(helper, user_id, password):
+    result = helper.api.user_reactivate(user_id, password)
+    helper.output(result)
 
 
 @user.command()