dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('api', '0004_bookuserdata_last_changed'),
- ('piston', '0002_auto_20190228_2338'),
]
- state_operations = [
+ operations = [
migrations.CreateModel(
name='Consumer',
fields=[
],
),
]
-
- operations = [
- migrations.SeparateDatabaseAndState(state_operations=state_operations),
- ]
+++ /dev/null
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Consumer',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('name', models.CharField(max_length=255)),
- ('description', models.TextField()),
- ('key', models.CharField(max_length=18)),
- ('secret', models.CharField(max_length=32)),
- ('status', models.CharField(default=b'pending', max_length=16, choices=[(b'pending', b'Pending approval'), (b'accepted', b'Accepted'), (b'canceled', b'Canceled')])),
- ('user', models.ForeignKey(related_name='consumers', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
- ],
- ),
- migrations.CreateModel(
- name='Nonce',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('token_key', models.CharField(max_length=18)),
- ('consumer_key', models.CharField(max_length=18)),
- ('key', models.CharField(max_length=255)),
- ],
- ),
- migrations.CreateModel(
- name='Resource',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('name', models.CharField(max_length=255)),
- ('url', models.TextField(max_length=2047)),
- ('is_readonly', models.BooleanField(default=True)),
- ],
- ),
- migrations.CreateModel(
- name='Token',
- fields=[
- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
- ('key', models.CharField(max_length=18)),
- ('secret', models.CharField(max_length=32)),
- ('token_type', models.IntegerField(choices=[(1, 'Request'), (2, 'Access')])),
- ('timestamp', models.IntegerField()),
- ('is_approved', models.BooleanField(default=False)),
- ('consumer', models.ForeignKey(to='piston.Consumer')),
- ('user', models.ForeignKey(related_name='tokens', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
- ],
- ),
- ]
+++ /dev/null
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-02-28 22:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('piston', '0001_initial'),
- ]
-
- database_operations = [
- migrations.AlterModelTable('Nonce', 'api_nonce'),
- migrations.AlterModelTable('Consumer', 'api_consumer'),
- migrations.AlterModelTable('Token', 'api_token'),
- ]
-
- state_operations = [
- migrations.RemoveField(
- model_name='consumer',
- name='user',
- ),
- migrations.DeleteModel(
- name='Nonce',
- ),
- migrations.RemoveField(
- model_name='token',
- name='consumer',
- ),
- migrations.RemoveField(
- model_name='token',
- name='user',
- ),
- migrations.DeleteModel(
- name='Consumer',
- ),
- migrations.DeleteModel(
- name='Token',
- ),
- ]
-
- operations = [
- migrations.SeparateDatabaseAndState(
- database_operations=database_operations,
- state_operations=state_operations
- ),
- migrations.DeleteModel(
- name='Resource',
- ),
- ]
+++ /dev/null
-# -*- coding: utf-8 -*-
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
-#
-from oauthlib.oauth1 import AuthorizationEndpoint, OAuth1Error
-from django.contrib.auth.decorators import login_required
-from django import forms
-from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render
-from .request_validator import PistonRequestValidator
-from .utils import oauthlib_request, oauthlib_response
-
-
-class HttpResponseAppRedirect(HttpResponseRedirect):
- allowed_schemes = HttpResponseRedirect.allowed_schemes + ['wolnelekturyapp']
-
-
-class OAuthAuthenticationForm(forms.Form):
- oauth_token = forms.CharField(widget=forms.HiddenInput)
- oauth_callback = forms.CharField(widget=forms.HiddenInput) # changed from URLField - too strict
- # removed authorize_access - redundant
-
-
-class OAuth1AuthorizationEndpoint(AuthorizationEndpoint):
- def create_verifier(self, request, credentials):
- verifier = super(OAuth1AuthorizationEndpoint, self).create_verifier(request, credentials)
- return {
- 'oauth_token': verifier['oauth_token'],
- }
-
-
-@login_required
-def oauth_user_auth(request):
- endpoint = OAuth1AuthorizationEndpoint(PistonRequestValidator())
-
- if request.method == "GET":
- # Why not just get oauth_token here?
- # This is fairly straightforward, in't?
- try:
- realms, credentials = endpoint.get_realms_and_credentials(
- **oauthlib_request(request))
- except OAuth1Error as e:
- return HttpResponse(e.message, status=400)
- callback = request.GET.get('oauth_callback')
-
- form = OAuthAuthenticationForm(initial={
- 'oauth_token': credentials['resource_owner_key'],
- 'oauth_callback': callback,
- })
-
- return render(request, 'piston/authorize_token.html', {'form': form})
-
- elif request.method == "POST":
- try:
- response = oauthlib_response(
- endpoint.create_authorization_response(
- credentials={"user": request.user},
- **oauthlib_request(request)
- )
- )
- except OAuth1Error as e:
- return HttpResponse(e.message, status=400)
- else:
- return response
--- /dev/null
+{% extends "base/base.html" %}
+{% load i18n %}
+
+{% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %}
+
+{% block body %}
+ <h1>{% trans "Authorize access to Wolne Lektury" %}</h1>
+
+ <div class="normal-text">
+ <p>
+ {% blocktrans %}Confirm to authorize access to Wolne Lektury as user <strong>{{ user}}</strong>.{% endblocktrans %}
+ </p>
+
+ <form action="{% url 'oauth_user_auth' %}" method="POST">
+ {% csrf_token %}
+ {{ form.as_p }}
+ <button type="submit">{% trans "Confirm" %}</button>
+ </form>
+ </div>
+{% endblock %}
from django.views.generic import TemplateView
import catalogue.views
from stats.utils import piwik_track_view
-from api.piston_patch import oauth_user_auth
from . import views
urlpatterns = [
url(r'^oauth/request_token/$', views.OAuth1RequestTokenView.as_view()),
- url(r'^oauth/authorize/$', oauth_user_auth, name='oauth_user_auth'),
+ url(r'^oauth/authorize/$', views.oauth_user_auth, name='oauth_user_auth'),
url(r'^oauth/access_token/$', csrf_exempt(views.OAuth1AccessTokenView.as_view())),
url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
from django.utils.decorators import method_decorator
from django.utils.encoding import iri_to_uri
from django.views.decorators.vary import vary_on_headers
vary_on_auth = method_decorator(vary_on_headers('Authorization'), 'dispatch')
+
+
+class HttpResponseAppRedirect(HttpResponseRedirect):
+ allowed_schemes = HttpResponseRedirect.allowed_schemes + ['wolnelekturyapp']
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
+from django.contrib.auth.decorators import login_required
+from django import forms
+from django.http import HttpResponse
from django.http import Http404
+from django.shortcuts import render
from django.views.generic.base import View
from oauthlib.common import urlencode
from oauthlib.oauth1 import RequestTokenEndpoint, AccessTokenEndpoint
+from oauthlib.oauth1 import AuthorizationEndpoint, OAuth1Error
from api.models import KEY_SIZE, SECRET_SIZE
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
)
+class OAuthAuthenticationForm(forms.Form):
+ oauth_token = forms.CharField(widget=forms.HiddenInput)
+ oauth_callback = forms.CharField(widget=forms.HiddenInput) # changed from URLField - too strict
+ # removed authorize_access - redundant
+
+
+class OAuth1AuthorizationEndpoint(AuthorizationEndpoint):
+ def create_verifier(self, request, credentials):
+ verifier = super(OAuth1AuthorizationEndpoint, self).create_verifier(request, credentials)
+ return {
+ 'oauth_token': verifier['oauth_token'],
+ }
+
+
+@login_required
+def oauth_user_auth(request):
+ endpoint = OAuth1AuthorizationEndpoint(PistonRequestValidator())
+
+ if request.method == "GET":
+ # Why not just get oauth_token here?
+ # This is fairly straightforward, in't?
+ try:
+ realms, credentials = endpoint.get_realms_and_credentials(
+ **oauthlib_request(request))
+ except OAuth1Error as e:
+ return HttpResponse(e.message, status=400)
+ callback = request.GET.get('oauth_callback')
+
+ form = OAuthAuthenticationForm(initial={
+ 'oauth_token': credentials['resource_owner_key'],
+ 'oauth_callback': callback,
+ })
+
+ return render(request, 'oauth/authorize_token.html', {'form': form})
+
+ elif request.method == "POST":
+ try:
+ response = oauthlib_response(
+ endpoint.create_authorization_response(
+ credentials={"user": request.user},
+ **oauthlib_request(request)
+ )
+ )
+ except OAuth1Error as e:
+ return HttpResponse(e.message, status=400)
+ else:
+ return response
+
+
class OAuth1AccessTokenEndpoint(AccessTokenEndpoint):
def _create_request(self, *args, **kwargs):
r = super(OAuth1AccessTokenEndpoint, self)._create_request(*args, **kwargs)
from django.http.response import HttpResponseRedirect, HttpResponseForbidden
from django.shortcuts import render
-from api.piston_patch import HttpResponseAppRedirect
+from api.utils import HttpResponseAppRedirect
from paypal.forms import PaypalSubscriptionForm
from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
from paypal.models import BillingAgreement, BillingPlan
'rest_framework',
'fnp_django_pagination',
'pipeline',
- 'api.piston',
'piwik',
'sorl.thumbnail',
'kombu.transport.django',
+++ /dev/null
-{% extends "base/base.html" %}
-{% load i18n %}
-
-{% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %}
-
-{% block body %}
- <h1>{% trans "Authorize access to Wolne Lektury" %}</h1>
-
- <div class="normal-text">
- <p>
- {% blocktrans %}Confirm to authorize access to Wolne Lektury as user <strong>{{ user}}</strong>.{% endblocktrans %}
- </p>
-
- <form action="{% url 'oauth_user_auth' %}" method="POST">
- {% csrf_token %}
- {{ form.as_p }}
- <button type="submit">{% trans "Confirm" %}</button>
- </form>
- </div>
-{% endblock %}
fnp / wolnelektury.git / commitdiff