modified get_user function to take kwargs instead of username

mediagoblin/auth/__init__.py

@@ -16,8 +16,9 @@
 from mediagoblin.tools.pluginapi import hook_handle, hook_runall
 
 
-def get_user(username):
+def get_user(**kwargs):
-    return hook_handle("auth_get_user", username)
+    """ Takes a kwarg such as username and returns a user object """
+    return hook_handle("auth_get_user", **kwargs)
 
 
 def create_user(register_form):

mediagoblin/auth/tools.py

@@ -199,7 +199,7 @@ def register_user(request, register_form):
 
 
 def check_login_simple(username, password):
-    user = auth.get_user(username)
+    user = auth.get_user(username=username)
     if not user:
         _log.info("User %r not found", username)
         auth.fake_login_attempt()

mediagoblin/plugins/basic_auth/__init__.py

@@ -26,17 +26,19 @@ def setup_plugin():
     config = pluginapi.get_config('mediagoblin.pluginapi.basic_auth')
 
 
-def get_user(username):
+def get_user(**kwargs):
-    user = User.query.filter(
+    username = kwargs.pop('username', None)
-        or_(
+    if username:
-            User.username == username,
+        user = User.query.filter(
-            User.email == username,
+            or_(
-        )).first()
+                User.username == username,
-    return user
+                User.email == username,
+            )).first()
+        return user
 
 
 def create_user(registration_form):
-    user = get_user(registration_form.username.data)
+    user = get_user(username=registration_form.username.data)
     if not user and 'password' in registration_form:
         user = User()
         user.username = registration_form.username.data