diff options
Diffstat (limited to 'mediagoblin/decorators.py')
| -rw-r--r-- | mediagoblin/decorators.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 5bf60048..b5ec0ce8 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -16,10 +16,11 @@ from functools import wraps -from urlparse import urljoin from werkzeug.exceptions import Forbidden, NotFound from oauthlib.oauth1 import ResourceEndpoint +from six.moves.urllib.parse import urljoin + from mediagoblin import mg_globals as mgg from mediagoblin import messages from mediagoblin.db.models import MediaEntry, User, MediaComment, AccessToken @@ -406,7 +407,7 @@ def oauth_required(controller): request_validator = GMGRequestValidator() resource_endpoint = ResourceEndpoint(request_validator) valid, r = resource_endpoint.validate_protected_resource_request( - uri=request.url, + uri=request.base_url, http_method=request.method, body=request.data, headers=dict(request.headers), @@ -418,9 +419,9 @@ def oauth_required(controller): # Fill user if not already token = authorization[u"oauth_token"] - access_token = AccessToken.query.filter_by(token=token).first() - if access_token is not None and request.user is None: - user_id = access_token.user + request.access_token = AccessToken.query.filter_by(token=token).first() + if request.access_token is not None and request.user is None: + user_id = request.access_token.user request.user = User.query.filter_by(id=user_id).first() return controller(request, *args, **kwargs) |