heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes tests

Browse Source
This commit is contained in:
xray7224 2013-07-14 19:00:52 +01:00
parent 670717d950
commit 1c694fbec5
8 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/federation/routing.py
View File

@ -23,7 +23,6 @@ add_route(
"mediagoblin.federation.views:client_register" "mediagoblin.federation.views:client_register"
) )
add_route( add_route(
"mediagoblin.federation", "mediagoblin.federation",
"/oauth/request_token", "/oauth/request_token",
@ -42,8 +41,3 @@ add_route(
"mediagoblin.federation.views:access_token" "mediagoblin.federation.views:access_token"
) )
add_route(
"mediagoblin.federation",
"/api/test",
"mediagoblin.federation.views:test"
)

4
mediagoblin/federation/views.py
View File

@ -346,7 +346,3 @@ def access_token(request):
tokens = av.create_access_token(request, {}) tokens = av.create_access_token(request, {})
return form_response(tokens) return form_response(tokens)
@csrf_exempt
@oauth_required
def test(request):
return json_response({"check":"OK"})

2
mediagoblin/plugins/api/views.py
View File

@ -21,7 +21,7 @@ from os.path import splitext
from werkzeug.exceptions import BadRequest, Forbidden from werkzeug.exceptions import BadRequest, Forbidden
from werkzeug.wrappers import Response from werkzeug.wrappers import Response
from mediagoblin.tools.json import json_response from mediagoblin.tools.response import json_response
from mediagoblin.decorators import require_active_login from mediagoblin.decorators import require_active_login
from mediagoblin.meddleware.csrf import csrf_exempt from mediagoblin.meddleware.csrf import csrf_exempt
from mediagoblin.media_types import sniff_media from mediagoblin.media_types import sniff_media

12
mediagoblin/plugins/oauth/__init__.py
View File

@ -35,22 +35,22 @@ def setup_plugin():
routes = [ routes = [
('mediagoblin.plugins.oauth.authorize', ('mediagoblin.plugins.oauth.authorize',
'/oauth/authorize', '/oauth-2/authorize',
'mediagoblin.plugins.oauth.views:authorize'), 'mediagoblin.plugins.oauth.views:authorize'),
('mediagoblin.plugins.oauth.authorize_client', ('mediagoblin.plugins.oauth.authorize_client',
'/oauth/client/authorize', '/oauth-2/client/authorize',
'mediagoblin.plugins.oauth.views:authorize_client'), 'mediagoblin.plugins.oauth.views:authorize_client'),
('mediagoblin.plugins.oauth.access_token', ('mediagoblin.plugins.oauth.access_token',
'/oauth/access_token', '/oauth-2/access_token',
'mediagoblin.plugins.oauth.views:access_token'), 'mediagoblin.plugins.oauth.views:access_token'),
('mediagoblin.plugins.oauth.list_connections', ('mediagoblin.plugins.oauth.list_connections',
'/oauth/client/connections', '/oauth-2/client/connections',
'mediagoblin.plugins.oauth.views:list_connections'), 'mediagoblin.plugins.oauth.views:list_connections'),
('mediagoblin.plugins.oauth.register_client', ('mediagoblin.plugins.oauth.register_client',
'/oauth/client/register', '/oauth-2/client/register',
'mediagoblin.plugins.oauth.views:register_client'), 'mediagoblin.plugins.oauth.views:register_client'),
('mediagoblin.plugins.oauth.list_clients', ('mediagoblin.plugins.oauth.list_clients',
'/oauth/client/list', '/oauth-2/client/list',
'mediagoblin.plugins.oauth.views:list_clients')] 'mediagoblin.plugins.oauth.views:list_clients')]
pluginapi.register_routes(routes) pluginapi.register_routes(routes)

2
mediagoblin/plugins/oauth/tools.py
View File

@ -23,7 +23,7 @@ from datetime import datetime
from functools import wraps from functools import wraps
from mediagoblin.tools.json import json_response from mediagoblin.tools.response import json_response
def require_client_auth(controller): def require_client_auth(controller):

3
mediagoblin/plugins/oauth/views.py
View File

@ -21,8 +21,7 @@ from urllib import urlencode
from werkzeug.exceptions import BadRequest 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.tools.json import json_response
from mediagoblin.decorators import require_active_login from mediagoblin.decorators import require_active_login
from mediagoblin.messages import add_message, SUCCESS from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.translate import pass_to_ugettext as _

4
mediagoblin/tests/test_http_callback.py
View File

@ -23,7 +23,7 @@ from mediagoblin import mg_globals
from mediagoblin.tools import processing from mediagoblin.tools import processing
from mediagoblin.tests.tools import fixture_add_user from mediagoblin.tests.tools import fixture_add_user
from mediagoblin.tests.test_submission import GOOD_PNG from mediagoblin.tests.test_submission import GOOD_PNG
from mediagoblin.tests import test_oauth as oauth from mediagoblin.tests import test_oauth2 as oauth
class TestHTTPCallback(object): class TestHTTPCallback(object):
@ -44,7 +44,7 @@ class TestHTTPCallback(object):
'password': self.user_password}) 'password': self.user_password})
def get_access_token(self, client_id, client_secret, code): def get_access_token(self, client_id, client_secret, code):
response = self.test_app.get('/oauth/access_token', { response = self.test_app.get('/oauth-2/access_token', {
'code': code, 'code': code,
'client_id': client_id, 'client_id': client_id,
'client_secret': client_secret}) 'client_secret': client_secret})

12
mediagoblin/tests/test_oauth.py → mediagoblin/tests/test_oauth2.py
View File

@ -51,7 +51,7 @@ class TestOAuth(object):
def register_client(self, name, client_type, description=None, def register_client(self, name, client_type, description=None,
redirect_uri=''): redirect_uri=''):
return self.test_app.post( return self.test_app.post(
'/oauth/client/register', { '/oauth-2/client/register', {
'name': name, 'name': name,
'description': description, 'description': description,
'type': client_type, 'type': client_type,
@ -115,7 +115,7 @@ class TestOAuth(object):
client_identifier = client.identifier client_identifier = client.identifier
redirect_uri = 'https://foo.example' redirect_uri = 'https://foo.example'
response = self.test_app.get('/oauth/authorize', { response = self.test_app.get('/oauth-2/authorize', {
'client_id': client.identifier, 'client_id': client.identifier,
'scope': 'all', 'scope': 'all',
'redirect_uri': redirect_uri}) 'redirect_uri': redirect_uri})
@ -129,7 +129,7 @@ class TestOAuth(object):
# Short for client authorization post reponse # Short for client authorization post reponse
capr = self.test_app.post( capr = self.test_app.post(
'/oauth/client/authorize', { '/oauth-2/client/authorize', {
'client_id': form.client_id.data, 'client_id': form.client_id.data,
'allow': 'Allow', 'allow': 'Allow',
'next': form.next.data}) 'next': form.next.data})
@ -155,7 +155,7 @@ class TestOAuth(object):
client = self.db.OAuthClient.query.filter( client = self.db.OAuthClient.query.filter(
self.db.OAuthClient.identifier == unicode(client_id)).first() self.db.OAuthClient.identifier == unicode(client_id)).first()
token_res = self.test_app.get('/oauth/access_token?client_id={0}&\ token_res = self.test_app.get('/oauth-2/access_token?client_id={0}&\
code={1}&client_secret={2}'.format(client_id, code, client.secret)) code={1}&client_secret={2}'.format(client_id, code, client.secret))
assert token_res.status_int == 200 assert token_res.status_int == 200
@ -183,7 +183,7 @@ code={1}&client_secret={2}'.format(client_id, code, client.secret))
client = self.db.OAuthClient.query.filter( client = self.db.OAuthClient.query.filter(
self.db.OAuthClient.identifier == unicode(client_id)).first() self.db.OAuthClient.identifier == unicode(client_id)).first()
token_res = self.test_app.get('/oauth/access_token?\ token_res = self.test_app.get('/oauth-2/access_token?\
code={0}&client_secret={1}'.format(code, client.secret)) code={0}&client_secret={1}'.format(code, client.secret))
assert token_res.status_int == 200 assert token_res.status_int == 200
@ -204,7 +204,7 @@ code={0}&client_secret={1}'.format(code, client.secret))
client = self.db.OAuthClient.query.filter( client = self.db.OAuthClient.query.filter(
self.db.OAuthClient.identifier == client_id).first() self.db.OAuthClient.identifier == client_id).first()
token_res = self.test_app.get('/oauth/access_token', token_res = self.test_app.get('/oauth-2/access_token',
{'refresh_token': token_data['refresh_token'], {'refresh_token': token_data['refresh_token'],
'client_id': client_id, 'client_id': client_id,
'client_secret': client.secret 'client_secret': client.secret