diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-15 10:34:20 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-15 10:34:20 -0500 |
| commit | 4834ef8ec21e985290f5e0015ae9452070956170 (patch) | |
| tree | 365b6043f4a18a40a01d5aa13700ab98ee031613 /mediagoblin/plugins/oauth | |
| parent | 29cd702e4776811a96c3c088bd9ba8fc6f9176f0 (diff) | |
| parent | 89909bd6921efb4ec3296c908c5d57eba35ebd21 (diff) | |
| download | mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.lz mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.xz mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.zip | |
Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools! Heck yeah!
Diffstat (limited to 'mediagoblin/plugins/oauth')
| -rw-r--r-- | mediagoblin/plugins/oauth/__init__.py | 12 | ||||
| -rw-r--r-- | mediagoblin/plugins/oauth/tools.py | 2 | ||||
| -rw-r--r-- | mediagoblin/plugins/oauth/views.py | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py index 5762379d..82c1f380 100644 --- a/mediagoblin/plugins/oauth/__init__.py +++ b/mediagoblin/plugins/oauth/__init__.py @@ -35,22 +35,22 @@ def setup_plugin(): routes = [ ('mediagoblin.plugins.oauth.authorize', - '/oauth/authorize', + '/oauth-2/authorize', 'mediagoblin.plugins.oauth.views:authorize'), ('mediagoblin.plugins.oauth.authorize_client', - '/oauth/client/authorize', + '/oauth-2/client/authorize', 'mediagoblin.plugins.oauth.views:authorize_client'), ('mediagoblin.plugins.oauth.access_token', - '/oauth/access_token', + '/oauth-2/access_token', 'mediagoblin.plugins.oauth.views:access_token'), ('mediagoblin.plugins.oauth.list_connections', - '/oauth/client/connections', + '/oauth-2/client/connections', 'mediagoblin.plugins.oauth.views:list_connections'), ('mediagoblin.plugins.oauth.register_client', - '/oauth/client/register', + '/oauth-2/client/register', 'mediagoblin.plugins.oauth.views:register_client'), ('mediagoblin.plugins.oauth.list_clients', - '/oauth/client/list', + '/oauth-2/client/list', 'mediagoblin.plugins.oauth.views:list_clients')] pluginapi.register_routes(routes) diff --git a/mediagoblin/plugins/oauth/tools.py b/mediagoblin/plugins/oauth/tools.py index 27ff32b4..af0a3305 100644 --- a/mediagoblin/plugins/oauth/tools.py +++ b/mediagoblin/plugins/oauth/tools.py @@ -23,7 +23,7 @@ from datetime import datetime from functools import wraps -from mediagoblin.plugins.api.tools import json_response +from mediagoblin.tools.response import json_response def require_client_auth(controller): diff --git a/mediagoblin/plugins/oauth/views.py b/mediagoblin/plugins/oauth/views.py index d6fd314f..de637d6b 100644 --- a/mediagoblin/plugins/oauth/views.py +++ b/mediagoblin/plugins/oauth/views.py @@ -21,7 +21,7 @@ from urllib import urlencode from werkzeug.exceptions import BadRequest -from mediagoblin.tools.response import render_to_response, redirect +from mediagoblin.tools.response import render_to_response, redirect, json_response from mediagoblin.decorators import require_active_login from mediagoblin.messages import add_message, SUCCESS from mediagoblin.tools.translate import pass_to_ugettext as _ @@ -31,7 +31,6 @@ from mediagoblin.plugins.oauth.forms import ClientRegistrationForm, \ AuthorizationForm from mediagoblin.plugins.oauth.tools import require_client_auth, \ create_token -from mediagoblin.plugins.api.tools import json_response _log = logging.getLogger(__name__) |