X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/7628e1246f2c6c65fd359a20a1c57e79b279d0d4..c3e563338050cf161ed6568d01c8a5f010257c2f:/src/api/urls.py?ds=inline diff --git a/src/api/urls.py b/src/api/urls.py index 28dc51c13..d93bcce00 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -2,55 +2,55 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -from django.conf.urls import url +from django.conf.urls import url, include from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView from piston.authentication import OAuthAuthentication, oauth_access_token, oauth_request_token from piston.resource import Resource -from ssify import ssi_included import catalogue.views from api import handlers from api.helpers import CsrfExemptResource from api.piston_patch import oauth_user_auth +from . import views auth = OAuthAuthentication(realm="Wolne Lektury") -book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentication=auth) -ebook_list_resource = Resource(handler=handlers.EBooksHandler) -# book_list_resource = Resource(handler=handlers.BooksHandler) -book_resource = Resource(handler=handlers.BookDetailHandler) -filter_book_resource = Resource(handler=handlers.FilterBooksHandler) -epub_resource = Resource(handler=handlers.EpubHandler) -collection_resource = Resource(handler=handlers.CollectionDetailHandler) -collection_list_resource = Resource(handler=handlers.CollectionsHandler) +class DjangoAuthentication(object): + """ + Authentication handler that always returns + True, so no authentication is needed, nor + initiated (`challenge` is missing.) + """ + def is_authenticated(self, request): + return request.user.is_authenticated() -tag_list_resource = Resource(handler=handlers.TagsHandler) -tag_resource = Resource(handler=handlers.TagDetailHandler) + def challenge(self): + from django.http import HttpResponse + resp = HttpResponse("Authorization Required") + resp.status_code = 401 + return resp -fragment_resource = Resource(handler=handlers.FragmentDetailHandler) -fragment_list_resource = Resource(handler=handlers.FragmentsHandler) -picture_resource = CsrfExemptResource(handler=handlers.PictureHandler, authentication=auth) +def auth_resource(handler): + from django.conf import settings + if settings.DEBUG: + django_auth = DjangoAuthentication() + return CsrfExemptResource(handler=handler, authentication=django_auth) + return CsrfExemptResource(handler=handler, authentication=auth) -tags_re = r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})' -paginate_re = r'(?:before/(?P[a-z0-9-]+)/)?(?:after/(?P[a-z0-9-]+)/)?(?:count/(?P[0-9]+)/)?$' +book_list_resource = auth_resource(handler=handlers.BooksHandler) +ebook_list_resource = Resource(handler=handlers.EBooksHandler) +filter_book_resource = auth_resource(handler=handlers.FilterBooksHandler) + +picture_resource = auth_resource(handler=handlers.PictureHandler) +blog_resource = Resource(handler=handlers.BlogEntryHandler) -@ssi_included -def incl(request, model, pk, emitter_format): - resource = { - 'book': book_list_resource, - 'fragment': fragment_list_resource, - 'tag': tag_list_resource, - }[model] - request.piwik_track = False - resp = resource(request, pk=pk, emitter_format=emitter_format) - if emitter_format == 'xml': - # Ugly, but quick way of stripping header and tags. - resp.content = resp.content[49:-11] - return resp + +tags_re = r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})' +paginate_re = r'(?:after/(?P[a-z0-9-]+)/)?(?:count/(?P[0-9]+)/)?$' urlpatterns = [ @@ -59,51 +59,28 @@ urlpatterns = [ url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)), url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'), - url(r'^include/(?Pbook|fragment|tag)/(?P\d+)\.(?P.+)\.(?Pxml|json)$', - incl, name='api_include'), # info boxes (used by mobile app) url(r'book/(?P\d*?)/info\.html$', catalogue.views.book_info), url(r'tag/(?P\d*?)/info\.html$', catalogue.views.tag_info), - # books by collections - url(r'^collections/$', collection_list_resource, name="api_collections"), - url(r'^collections/(?P[^/]+)/$', collection_resource, name="api_collection"), - - # epub preview - url(r'^epub/(?P[a-z0-9-]+)/$', epub_resource, name='api_epub'), - - # objects details - url(r'^books/(?P[a-z0-9-]+)/$', book_resource, name="api_book"), - url(r'^(?P[a-z0-9-]+)/(?P[a-z0-9-]+)/$', - tag_resource, name="api_tag"), - url(r'^books/(?P[a-z0-9-]+)/fragments/(?P[a-z0-9-]+)/$', - fragment_resource, name="api_fragment"), + # reading data + url(r'^reading/(?P[a-z0-9-]+)/$', views.BookUserDataView.as_view(), name='api_reading'), + url(r'^reading/(?P[a-z0-9-]+)/(?P[a-z]+)/$', views.BookUserDataView.as_view(), name='api_reading'), + url(r'^username/$', views.UserView.as_view(), name='api_username'), # books by tags - url(tags_re + r'books/' + paginate_re, - book_list_resource, name='api_book_list'), url(tags_re + r'ebooks/' + paginate_re, ebook_list_resource, name='api_ebook_list'), - url(tags_re + r'parent_books/' + paginate_re, - book_list_resource, {"top_level": True}, name='api_parent_book_list'), url(tags_re + r'parent_ebooks/' + paginate_re, ebook_list_resource, {"top_level": True}, name='api_parent_ebook_list'), - url(tags_re + r'audiobooks/' + paginate_re, - book_list_resource, {"audiobooks": True}, name='api_audiobook_list'), - url(tags_re + r'daisy/' + paginate_re, - book_list_resource, {"daisy": True}, name='api_daisy_list'), - url(r'^recommended/' + paginate_re, book_list_resource, {"recommended": True}, name='api_recommended_list'), - url(r'^newest/', book_list_resource, {"newest": True, "top_level": True, "count": 20}, name='api_newest_list'), - url(r'^filter-books/', filter_book_resource, name='api_filter_books'), + url(r'^filter-books/$', filter_book_resource, name='api_filter_books'), url(r'^pictures/$', picture_resource), - # fragments by book, tags, themes - # this should be paged - url(r'^(?P(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', fragment_list_resource), + url(r'^blog/$', blog_resource), - # tags by category - url(r'^(?P[a-z0-9-]+)/$', tag_list_resource, name='api_tag_list'), + url(r'^', include('social.api.urls')), + url(r'^', include('catalogue.api.urls')), ]