aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/httpapiauth/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/plugins/httpapiauth/__init__.py')
-rw-r--r--mediagoblin/plugins/httpapiauth/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/plugins/httpapiauth/__init__.py b/mediagoblin/plugins/httpapiauth/__init__.py
index 09c99080..2b2d593c 100644
--- a/mediagoblin/plugins/httpapiauth/__init__.py
+++ b/mediagoblin/plugins/httpapiauth/__init__.py
@@ -18,8 +18,8 @@ import logging
from werkzeug.exceptions import Unauthorized
+from mediagoblin.auth.tools import check_login_simple
from mediagoblin.plugins.api.tools import Auth
-from mediagoblin.auth import check_login
_log = logging.getLogger(__name__)
@@ -40,10 +40,10 @@ class HTTPAuth(Auth):
if not request.authorization:
return False
- user = request.db.User.query.filter_by(
- username=unicode(request.authorization['username'])).first()
+ user = check_login_simple(unicode(request.authorization['username']),
+ request.authorization['password'])
- if check_login(user, request.authorization['password']):
+ if user:
request.user = user
return True
else: