Get ready for 3.4.4. Minor enhancement to CLI. (#365)

Author: jwag956

CHANGES.rst

@@ -17,7 +17,7 @@ Release Target 2020
 Version 3.4.4
 --------------
 
-Released July yy, 2020
+Released July 26, 2020
 
 Bug/regression fixes.
 
@@ -38,6 +38,8 @@ Fixed
 - (:issue:`347`) Fix peewee. Turns out - due to lack of unit tests - peewee hasn't worked since 'permissions' were added in 3.3.
   Furthermore, changes in 3.4 around get_id and alternative tokens also didn't work since peewee defines its own get_id.
 
+- (:pr:`xx`) Backport the reset_access CLI command from 4.0 - this is really useful for administrators.
+
 Compatibility Concerns
 ++++++++++++++++++++++
 
@@ -173,7 +175,8 @@ log out the current user, and log in the new user. This was problematic since
 this couldn't possibly work with CSRF.
 The old behavior has been restored, with the subtle change that older Flask-Security
 releases did not look at "next" in the form or request for the redirect,
-and now, all redirects from the login view will honor "next".
+and now, all redirects from the login view will honor "next" (N.B. see 3.4.4 - the
+handling of "next" has been removed due to redirect loops).
 
 Version 3.3.1
 -------------

docs/conf.py

@@ -58,7 +58,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = "3.4.3"
+version = "3.4.4"
 # The full version, including alpha/beta/rc tags.
 release = version
 

flask_security/__init__.py

@@ -101,4 +101,4 @@
     verify_and_update_password,
 )
 
-__version__ = "3.4.3"
+__version__ = "3.4.4"

flask_security/cli.py

@@ -121,15 +121,15 @@ def roles_create(**kwargs):
 @with_appcontext
 @commit
 def roles_add(user, role):
-    """Add user to role."""
+    """Add role to user."""
     user, role = _datastore._prepare_role_modify_args(user, role)
     if user is None:
         raise click.UsageError("Cannot find user.")
     if role is None:
         raise click.UsageError("Cannot find role.")
     if _datastore.add_role_to_user(user, role):
         click.secho(
-            'Role "{0}" added to user "{1}" ' "successfully.".format(role, user),
+            'Role "{0}" added to user "{1}" ' "successfully.".format(role.name, user),
             fg="green",
         )
     else:
@@ -142,15 +142,16 @@ def roles_add(user, role):
 @with_appcontext
 @commit
 def roles_remove(user, role):
-    """Remove user from role."""
+    """Remove role from user."""
     user, role = _datastore._prepare_role_modify_args(user, role)
     if user is None:
         raise click.UsageError("Cannot find user.")
     if role is None:
         raise click.UsageError("Cannot find role.")
     if _datastore.remove_role_from_user(user, role):
         click.secho(
-            'Role "{0}" removed from user "{1}" ' "successfully.".format(role, user),
+            'Role "{0}" removed from user "{1}" '
+            "successfully.".format(role.name, user),
             fg="green",
         )
     else:
@@ -165,7 +166,7 @@ def users_activate(user):
     """Activate a user."""
     user_obj = _datastore.get_user(user)
     if user_obj is None:
-        raise click.UsageError("ERROR: User not found.")
+        raise click.UsageError("User not found.")
     if _datastore.activate_user(user_obj):
         click.secho('User "{0}" has been activated.'.format(user), fg="green")
     else:
@@ -180,8 +181,29 @@ def users_deactivate(user):
     """Deactivate a user."""
     user_obj = _datastore.get_user(user)
     if user_obj is None:
-        raise click.UsageError("ERROR: User not found.")
+        raise click.UsageError("User not found.")
     if _datastore.deactivate_user(user_obj):
         click.secho('User "{0}" has been deactivated.'.format(user), fg="green")
     else:
         click.secho('User "{0}" was already deactivated.'.format(user), fg="yellow")
+
+
+@users.command(
+    "reset_access",
+    help="Reset all authentication credentials for user."
+    " This includes session, auth token, two-factor"
+    " and unified sign in secrets. ",
+)
+@click.argument("user")
+@with_appcontext
+@commit
+def users_reset_access(user):
+    """ Reset all authentication tokens etc."""
+    user_obj = _datastore.get_user(user)
+    if user_obj is None:
+        raise click.UsageError("User not found.")
+    _datastore.reset_user_access(user_obj)
+    click.secho(
+        'User "{user}" authentication credentials have been reset.'.format(user=user),
+        fg="green",
+    )