aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/basic_auth/__init__.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-27 08:39:34 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-27 08:39:34 -0700
commitcdc6b571e33ee0cd90fa8f2be270df77d7f6d9d9 (patch)
tree6f529d21a3596698f09afceccfb4d2714305be6d /mediagoblin/plugins/basic_auth/__init__.py
parentbcd10ad6633d90b5feae4f5dec8cf5d5754d51b5 (diff)
downloadmediagoblin-cdc6b571e33ee0cd90fa8f2be270df77d7f6d9d9.tar.lz
mediagoblin-cdc6b571e33ee0cd90fa8f2be270df77d7f6d9d9.tar.xz
mediagoblin-cdc6b571e33ee0cd90fa8f2be270df77d7f6d9d9.zip
cleanup after merge
Diffstat (limited to 'mediagoblin/plugins/basic_auth/__init__.py')
-rw-r--r--mediagoblin/plugins/basic_auth/__init__.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py
index 2fe161cb..edbfacb5 100644
--- a/mediagoblin/plugins/basic_auth/__init__.py
+++ b/mediagoblin/plugins/basic_auth/__init__.py
@@ -34,19 +34,17 @@ def check_login(user, password):
return None
-def get_user(form):
- if 'username' in form.data:
- username = form.username.data
- user = User.query.filter(
- or_(
- User.username == username,
- User.email == username,
- )).first()
- return user
+def get_user(username):
+ user = User.query.filter(
+ or_(
+ User.username == username,
+ User.email == username,
+ )).first()
+ return user
def create_user(registration_form):
- user = get_user(registration_form)
+ user = get_user(registration_form.username.data)
if not user and 'password' in registration_form:
user = User()
user.username = registration_form.username.data