From: Radek Czajka Date: Wed, 8 Jun 2011 11:15:32 +0000 (+0200) Subject: api for redakcja (needs some testing and chrome) X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/10510d28f980e9a61bdd2b5471e78eec872952ba?ds=sidebyside;hp=-c api for redakcja (needs some testing and chrome) --- 10510d28f980e9a61bdd2b5471e78eec872952ba diff --git a/apps/api/handlers.py b/apps/api/handlers.py index 40121d6af..ce29c61cc 100644 --- a/apps/api/handlers.py +++ b/apps/api/handlers.py @@ -2,29 +2,43 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from functools import wraps + from django.shortcuts import get_object_or_404 -from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib.auth.decorators import login_required, permission_required from piston.handler import BaseHandler from piston.utils import rc, validate from catalogue.models import Book from catalogue.forms import BookImportForm -staff_required = user_passes_test(lambda user: user.is_staff) +def method_decorator(function_decorator): + """ + Turns a function(*args, **kwargs) decorator into an + equivalent decorator for method(self, *args, **kwargs). + """ + @wraps(function_decorator) + def decorator(method): + @wraps(method) + def decorated_method(self, *args, **kwargs): + def method_as_function(*fargs, **fkwargs): + return method(self, *fargs, **fkwargs) + return function_decorator(method_as_function)(*args, **kwargs) + return decorated_method + return decorator class BookHandler(BaseHandler): model = Book fields = ('slug', 'title') - @staff_required def read(self, request, slug=None): if slug: return get_object_or_404(Book, slug=slug) else: return Book.objects.all() - @staff_required + @method_decorator(permission_required('catalogue.add_book')) def create(self, request): form = BookImportForm(request.POST, request.FILES) if form.is_valid(): diff --git a/apps/api/templates/oauth/challenge.html b/apps/api/templates/oauth/challenge.html new file mode 100755 index 000000000..e69de29bb diff --git a/apps/api/urls.py b/apps/api/urls.py index 8b1b9b0cb..d6f0dbf91 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -1,17 +1,22 @@ # -*- coding: utf-8 -*- from django.conf.urls.defaults import * from piston.resource import Resource -from piston.authentication import HttpBasicAuthentication +from piston.authentication import OAuthAuthentication from api.handlers import BookHandler -auth = HttpBasicAuthentication(realm='My sample API') +auth = OAuthAuthentication(realm="Wolne Lektury") book_resource = Resource(handler=BookHandler, authentication=auth) -urlpatterns = patterns('', +urlpatterns = patterns('', url(r'^books/(?P[^/]+)\.(?Pxml|json|yaml)$', book_resource), url(r'^books\.(?Pxml|json|yaml)$', book_resource), -) +) + patterns( + 'piston.authentication', + url(r'^oauth/request_token/$','oauth_request_token'), + url(r'^oauth/authorize/$','oauth_user_auth'), + url(r'^oauth/access_token/$','oauth_access_token'), +) diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index fd751965a..2bf974d44 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -3,6 +3,7 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms +from django.core.files.base import ContentFile from django.utils.translation import ugettext_lazy as _ from slughifi import slughifi @@ -12,7 +13,17 @@ from catalogue import utils class BookImportForm(forms.Form): - book_xml_file = forms.FileField() + book_xml_file = forms.FileField(required=False) + book_xml = forms.CharField(required=False) + + def clean(self): + if not self.cleaned_data['book_xml_file']: + if self.cleaned_data['book_xml']: + self.cleaned_data['book_xml_file'] = \ + ContentFile(self.cleaned_data['book_xml'].encode('utf-8')) + else: + raise forms.ValidationError(_("Please supply an XML.")) + return super(BookImportForm, self).clean() def save(self, commit=True, **kwargs): return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, **kwargs) diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index a47276378..2e20068c9 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -110,7 +110,7 @@ TEMPLATE_DIRS = [ path.join(PROJECT_DIR, 'templates'), ] -LOGIN_URL = '/uzytkownicy/zaloguj/' +LOGIN_URL = '/uzytkownicy/login/' LOGIN_REDIRECT_URL = '/' diff --git a/wolnelektury/templates/piston/authorize_token.html b/wolnelektury/templates/piston/authorize_token.html new file mode 100755 index 000000000..ba28adc4a --- /dev/null +++ b/wolnelektury/templates/piston/authorize_token.html @@ -0,0 +1,15 @@ + + + + Authorize Token + + +

Authorize Token

+ +
+ {{ form.as_table }} + +
+ + + diff --git a/wolnelektury/templates/registration/login.html b/wolnelektury/templates/registration/login.html new file mode 100755 index 000000000..b88d4e19d --- /dev/null +++ b/wolnelektury/templates/registration/login.html @@ -0,0 +1,5 @@ +
+ {% csrf_token %} + {{ form }} + +
diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index a99030f4d..340e58c85 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -40,6 +40,7 @@ urlpatterns = patterns('', url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'), url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'), url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'), + url(r'^uzytkownicy/login/$', 'django.contrib.auth.views.login', name='simple_login'), # API (r'^api/', include('api.urls')),