Add already confirmed scenario. Let datastore work without a request context

This commit is contained in:
Matt Wright
2012-08-21 01:50:40 -04:00
parent f2d5028d7c
commit 828a973339
6 changed files with 29 additions and 13 deletions
+3 -7
View File
@@ -28,6 +28,9 @@ class UserDatastore(object):
:param user_model: A user model class definition
:param role_model: A role model class definition
"""
pwd_context = None
default_roles = []
def __init__(self, db, user_model, role_model):
self.db = db
self.user_model = user_model
@@ -82,7 +85,6 @@ class UserDatastore(object):
def _prepare_create_user_args(self, **kwargs):
kwargs.setdefault('active', True)
kwargs.setdefault('roles', _security.default_roles)
roles = kwargs.get('roles', [])
for i, role in enumerate(roles):
@@ -91,12 +93,6 @@ class UserDatastore(object):
roles[i] = self.find_role(rn)
kwargs['roles'] = roles
pwd_context = _security.pwd_context
pw = kwargs['password']
if not pwd_context.identify(pw):
pwd_hash = utils.encrypt_password(pw)
kwargs['password'] = pwd_hash
return kwargs