aboutsummaryrefslogtreecommitdiff
path: root/wqflask/flask_security
diff options
context:
space:
mode:
authorLei Yan2013-10-11 14:49:54 -0500
committerLei Yan2013-10-11 14:49:54 -0500
commit79aed6879f138bb083af91f50cd4827789683062 (patch)
tree722be02d7f7ecbc7094a7519f59f6802e123fb97 /wqflask/flask_security
parent8a09358e98dbf88deb101d13107a40bac371de5c (diff)
parent38ae30a5fb46753a361e1c7454871430d7097c3b (diff)
downloadgenenetwork2-79aed6879f138bb083af91f50cd4827789683062.tar.gz
Merge /home/sam/gene
Diffstat (limited to 'wqflask/flask_security')
-rw-r--r--wqflask/flask_security/__init__.py4
-rw-r--r--wqflask/flask_security/core.py1
-rw-r--r--wqflask/flask_security/datastore.py1
-rw-r--r--wqflask/flask_security/forms.py9
-rw-r--r--wqflask/flask_security/registerable.py1
5 files changed, 14 insertions, 2 deletions
diff --git a/wqflask/flask_security/__init__.py b/wqflask/flask_security/__init__.py
index 297033c9..81e6c89e 100644
--- a/wqflask/flask_security/__init__.py
+++ b/wqflask/flask_security/__init__.py
@@ -12,8 +12,6 @@
__version__ = '1.6.0'
-print "using internal flask security"
-
from .core import Security, RoleMixin, UserMixin, AnonymousUser, current_user
from .datastore import SQLAlchemyUserDatastore, MongoEngineUserDatastore, PeeweeUserDatastore
from .decorators import auth_token_required, http_auth_required, \
@@ -23,3 +21,5 @@ from .forms import ForgotPasswordForm, LoginForm, RegisterForm, \
from .signals import confirm_instructions_sent, password_reset, \
reset_password_instructions_sent, user_confirmed, user_registered
from .utils import login_user, logout_user, url_for_security
+
+print "Using our own flask.ext.security" \ No newline at end of file
diff --git a/wqflask/flask_security/core.py b/wqflask/flask_security/core.py
index d794fad5..0f3a231f 100644
--- a/wqflask/flask_security/core.py
+++ b/wqflask/flask_security/core.py
@@ -207,6 +207,7 @@ def _get_serializer(app, name):
def _get_state(app, datastore, **kwargs):
for key, value in get_config(app).items():
+ print "in _get_state [{}]: {}".format(key, value)
kwargs[key.lower()] = value
kwargs.update(dict(
diff --git a/wqflask/flask_security/datastore.py b/wqflask/flask_security/datastore.py
index f8c7218d..634399d9 100644
--- a/wqflask/flask_security/datastore.py
+++ b/wqflask/flask_security/datastore.py
@@ -157,6 +157,7 @@ class UserDatastore(object):
"""Creates and returns a new user from the given parameters."""
user = self.user_model(**self._prepare_create_user_args(**kwargs))
+ print "in abstraced create_user, user is:", user
return self.put(user)
def delete_user(self, user):
diff --git a/wqflask/flask_security/forms.py b/wqflask/flask_security/forms.py
index e64e1502..54677e77 100644
--- a/wqflask/flask_security/forms.py
+++ b/wqflask/flask_security/forms.py
@@ -89,6 +89,12 @@ def valid_user_email(form, field):
class Form(BaseForm):
def __init__(self, *args, **kwargs):
+ #print "importing tracer"
+ #from wqflask import tracer
+ #tracer.turn_on()
+ #print "imported tracer"
+ print "in Form, args:", args
+ print "in Form, kwargs:", kwargs
if current_app.testing:
self.TIME_LIMIT = None
super(Form, self).__init__(*args, **kwargs)
@@ -148,10 +154,13 @@ class RegisterFormMixin():
def to_dict(form):
def is_field_and_user_attr(member):
+ print "in ifaua:", member
return isinstance(member, Field) and \
hasattr(_datastore.user_model, member.name)
+ print("green:", vars(form))
fields = inspect.getmembers(form, is_field_and_user_attr)
+ print("fields:" ,vars(form))
return dict((key, value.data) for key, value in fields)
diff --git a/wqflask/flask_security/registerable.py b/wqflask/flask_security/registerable.py
index 4e9f357d..4606c7c6 100644
--- a/wqflask/flask_security/registerable.py
+++ b/wqflask/flask_security/registerable.py
@@ -24,6 +24,7 @@ _datastore = LocalProxy(lambda: _security.datastore)
def register_user(**kwargs):
+ print "in register_user kwargs:", kwargs
confirmation_link, token = None, None
kwargs['password'] = encrypt_password(kwargs['password'])
user = _datastore.create_user(**kwargs)