Merge pull request #19 from tescalada/develop

Adding back lost role/active functions

flask_security/__init__.py

@@ -11,7 +11,7 @@
 """
 
 from .core import Security, RoleMixin, UserMixin, AnonymousUser, \
-     AuthenticationProvider
+     AuthenticationProvider, current_user
 from .decorators import auth_token_required, http_auth_required, \
      login_required, roles_accepted, roles_required
 from .forms import ForgotPasswordForm, LoginForm, RegisterForm, \

flask_security/datastore.py

@@ -45,6 +45,38 @@ class UserDatastore(object):
         raise NotImplementedError(
             "User datastore does not implement _do_find_role method")
 
+    def _do_add_role(self, user, role):
+        user, role = self._prepare_role_modify_args(user, role)
+        if role not in user.roles:
+            user.roles.append(role)
+        return user
+
+    def _do_remove_role(self, user, role):
+        user, role = self._prepare_role_modify_args(user, role)
+        if role in user.roles:
+            user.roles.remove(role)
+        return user
+
+    def _do_toggle_active(self, user, active=None):
+        user = self.find_user(email=user.email)
+        if active is None:
+            user.active = not user.active
+        elif active != user.active:
+            user.active = active
+        return user
+
+    def _do_deactive_user(self, user):
+        return self._do_toggle_active(user, False)
+
+    def _do_active_user(self, user):
+        return self._do_toggle_active(user, True)
+
+    def _prepare_role_modify_args(self, user, role):
+        if isinstance(role, self.role_model):
+            role = role.name
+
+        return self.find_user(email=user.email), self.find_role(role)
+
     def _prepare_create_role_args(self, kwargs):
         if kwargs['name'] is None:
             raise exceptions.RoleCreationError("Missing name argument")