MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '197-nodeinfo-accept' into 'develop' 

Resolve "Nodeinfo endpoint should be queryable with Accept: application/json"

Closes #197

See merge request funkwhale/funkwhale!197
This commit is contained in:
Eliot Berriot 2018-05-16 20:13:09 +00:00
parent ceccaa1387 e852c84007
commit d5872f4416
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/federation/views.py
View File

@ -88,7 +88,7 @@ class InstanceActorViewSet(FederationMixin, viewsets.GenericViewSet):
class WellKnownViewSet(viewsets.GenericViewSet): class WellKnownViewSet(viewsets.GenericViewSet):
authentication_classes = [] authentication_classes = []
permission_classes = [] permission_classes = []
renderer_classes = [renderers.WebfingerRenderer] renderer_classes = [renderers.JSONRenderer, renderers.WebfingerRenderer]
@list_route(methods=['get']) @list_route(methods=['get'])
def nodeinfo(self, request, *args, **kwargs): def nodeinfo(self, request, *args, **kwargs):

7
api/tests/federation/test_views.py
View File

@ -62,7 +62,10 @@ def test_wellknown_webfinger_system(
actor = actors.SYSTEM_ACTORS[system_actor].get_actor_instance() actor = actors.SYSTEM_ACTORS[system_actor].get_actor_instance()
url = reverse('federation:well-known-webfinger') url = reverse('federation:well-known-webfinger')
response = api_client.get( response = api_client.get(
url, data={'resource': 'acct:{}'.format(actor.webfinger_subject)}) url,
data={'resource': 'acct:{}'.format(actor.webfinger_subject)},
HTTP_ACCEPT='application/jrd+json',
)
serializer = serializers.ActorWebfingerSerializer(actor) serializer = serializers.ActorWebfingerSerializer(actor)
assert response.status_code == 200 assert response.status_code == 200
@ -83,7 +86,7 @@ def test_wellknown_nodeinfo(db, preferences, api_client, settings):
] ]
} }
url = reverse('federation:well-known-nodeinfo') url = reverse('federation:well-known-nodeinfo')
response = api_client.get(url) response = api_client.get(url, HTTP_ACCEPT='application/jrd+json')
assert response.status_code == 200 assert response.status_code == 200
assert response['Content-Type'] == 'application/jrd+json' assert response['Content-Type'] == 'application/jrd+json'
assert response.data == expected assert response.data == expected

1
changes/changelog.d/197.bugfix Normal file
View File

@ -0,0 +1 @@
.well-known/nodeinfo endpoint can now answer to request with Accept: application/json (#197)