aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
authorxray7224 <jessica@megworld.co.uk>2013-07-11 19:43:00 +0100
committerxray7224 <jessica@megworld.co.uk>2013-07-11 19:43:00 +0100
commit786bbd79e8d77c06a9d86aee00edc4dd3e89d651 (patch)
tree50def81289e6449f9a28a609132b06b6e1bb157a /mediagoblin/decorators.py
parent2b60a56cbec44f789ee2efe71294979d7784515c (diff)
downloadmediagoblin-786bbd79e8d77c06a9d86aee00edc4dd3e89d651.tar.lz
mediagoblin-786bbd79e8d77c06a9d86aee00edc4dd3e89d651.tar.xz
mediagoblin-786bbd79e8d77c06a9d86aee00edc4dd3e89d651.zip
Cleans up some of the OAuth code
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index ce26e46c..1fdb78d7 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -22,10 +22,11 @@ from werkzeug.exceptions import Forbidden, NotFound
from mediagoblin import mg_globals as mgg
from mediagoblin import messages
from mediagoblin.db.models import MediaEntry, User
-from mediagoblin.tools.request import decode_authorization_header
from mediagoblin.tools.response import json_response, redirect, render_404
from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.federation.tools.request import decode_authorization_header
+from mediagoblin.federation.oauth import GMGRequestValidator
def require_active_login(controller):
"""
@@ -282,3 +283,4 @@ def oauth_requeired(controller):
return json_response({"error": error}, status=400)
+