update librarian

[wolnelektury.git] / src / api / urls.py

diff --git a/src/api/urls.py b/src/api/urls.py
index 781766f..bd832fe 100644 (file)
--- 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 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
 import catalogue.views
 from api import handlers
 from api.helpers import CsrfExemptResource


@@ -16,7 +15,27 @@ from api.piston_patch import oauth_user_auth
 auth = OAuthAuthentication(realm="Wolne Lektury")
 
 
 auth = OAuthAuthentication(realm="Wolne Lektury")
 
 

+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):
 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)
 
 
     return CsrfExemptResource(handler=handler, authentication=auth)
 
 


@@ -24,7 +43,7 @@ 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)
 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)
+filter_book_resource = auth_resource(handler=handlers.FilterBooksHandler)

 epub_resource = auth_resource(handler=handlers.EpubHandler)
 
 preview_resource = Resource(handler=handlers.BookPreviewHandler)
 epub_resource = auth_resource(handler=handlers.EpubHandler)
 
 preview_resource = Resource(handler=handlers.BookPreviewHandler)


@@ -49,22 +68,7 @@ blog_resource = Resource(handler=handlers.BlogEntryHandler)
 
 
 tags_re = r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})'
 
 
 tags_re = r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})'

-paginate_re = r'(?:before/(?P<before>[a-z0-9-]+)/)?(?:after/(?P<after>[a-z0-9-]+)/)?(?:count/(?P<count>[0-9]+)/)?$'
-
-
-@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 <?xml?> header and <response> tags.
-        resp.content = resp.content[49:-11]
-    return resp
+paginate_re = r'(?:after/(?P<after>[a-z0-9-]+)/)?(?:count/(?P<count>[0-9]+)/)?$'

 
 
 urlpatterns = [
 
 
 urlpatterns = [


@@ -73,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'^oauth/access_token/$', csrf_exempt(oauth_access_token)),
 
     url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),

-    url(r'^include/(?P<model>book|fragment|tag)/(?P<pk>\d+)\.(?P<lang>.+)\.(?P<emitter_format>xml|json)$',
-        incl, name='api_include'),

 
     # info boxes (used by mobile app)
     url(r'book/(?P<book_id>\d*?)/info\.html$', catalogue.views.book_info),
 
     # info boxes (used by mobile app)
     url(r'book/(?P<book_id>\d*?)/info\.html$', catalogue.views.book_info),