X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/fa8ae232e2fb6480e1f99bdb8393eaf682c0d2d1..1123ad09c5b6b23721639c9a1454fd80999759ee:/src/api/urls.py diff --git a/src/api/urls.py b/src/api/urls.py index c5ede8fcb..bd832fe25 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -7,7 +7,6 @@ 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 @@ -15,15 +14,44 @@ from api.piston_patch import oauth_user_auth auth = OAuthAuthentication(realm="Wolne Lektury") -book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentication=auth) + +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() + + def challenge(self): + from django.http import HttpResponse + resp = HttpResponse("Authorization Required") + resp.status_code = 401 + return resp + + +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) + + +book_list_resource = auth_resource(handler=handlers.BooksHandler) 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, authentication=auth) +filter_book_resource = auth_resource(handler=handlers.FilterBooksHandler) +epub_resource = auth_resource(handler=handlers.EpubHandler) + +preview_resource = Resource(handler=handlers.BookPreviewHandler) -reading_resource = CsrfExemptResource(handler=handlers.UserDataHandler, authentication=auth) -shelf_resource = Resource(handler=handlers.UserShelfHandler, authentication=auth) +reading_resource = auth_resource(handler=handlers.UserDataHandler) +shelf_resource = auth_resource(handler=handlers.UserShelfHandler) + +like_resource = auth_resource(handler=handlers.UserLikeHandler) collection_resource = Resource(handler=handlers.CollectionDetailHandler) collection_list_resource = Resource(handler=handlers.CollectionsHandler) @@ -34,26 +62,13 @@ tag_resource = Resource(handler=handlers.TagDetailHandler) fragment_resource = Resource(handler=handlers.FragmentDetailHandler) fragment_list_resource = Resource(handler=handlers.FragmentsHandler) -picture_resource = CsrfExemptResource(handler=handlers.PictureHandler, authentication=auth) - +picture_resource = auth_resource(handler=handlers.PictureHandler) -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]+)/)?$' +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 = [ @@ -62,8 +77,6 @@ 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), @@ -82,6 +95,8 @@ urlpatterns = [ url(r'^shelf/(?P[a-z]+)/$', shelf_resource, name='api_shelf'), url(r'^username/$', reading_resource, name='api_username'), + url(r'^like/(?P[a-z0-9-]+)/$', like_resource, name='api_like'), + # objects details url(r'^books/(?P[a-z0-9-]+)/$', book_resource, name="api_book"), url(r'^(?P[a-z0-9-]+)/(?P[a-z0-9-]+)/$', @@ -104,11 +119,15 @@ urlpatterns = [ 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'^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'^preview/$', preview_resource, name='api_preview'), url(r'^pictures/$', picture_resource), + url(r'^blog/$', blog_resource), + # fragments by book, tags, themes # this should be paged url(r'^(?P(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', fragment_list_resource),