Request validation fix.

[wolnelektury.git] / src / club / views.py

diff --git a/src/club/views.py b/src/club/views.py
index 9816b4b..920180a 100644 (file)
--- a/src/club/views.py
+++ b/src/club/views.py
@@ -1,6 +1,12 @@
+# 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 import settings

 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render

+from django.utils.decorators import method_decorator
+from django.views.decorators.cache import never_cache

 from django.views.generic import FormView, CreateView, TemplateView, DetailView, UpdateView
 from django.views import View
 from .payu import POSS
 from django.views.generic import FormView, CreateView, TemplateView, DetailView, UpdateView
 from django.views import View
 from .payu import POSS


@@ -8,12 +14,17 @@ from .payu import views as payu_views
 from .forms import ScheduleForm, PayUCardTokenForm
 from . import models
 from .helpers import get_active_schedule
 from .forms import ScheduleForm, PayUCardTokenForm
 from . import models
 from .helpers import get_active_schedule

-from .payment_methods import payure_method
+from .payment_methods import recurring_payment_method

 
 
 class ClubView(TemplateView):
     template_name = 'club/index.html'
 
 
 
 class ClubView(TemplateView):
     template_name = 'club/index.html'
 

+    def get_context_data(self, *args, **kwargs):
+        ctx = super().get_context_data(*args, **kwargs)
+        ctx['active_menu_item'] = 'club'
+        return ctx
+

 
 class JoinView(CreateView):
     form_class = ScheduleForm
 
 class JoinView(CreateView):
     form_class = ScheduleForm


@@ -23,24 +34,27 @@ class JoinView(CreateView):
         return self.request.GET.get('app')
 
     def get(self, request):
         return self.request.GET.get('app')
 
     def get(self, request):

+        # TODO: configure as app-allowed hosts.
+        if settings.CLUB_APP_HOST and self.is_app() and request.META['HTTP_HOST'] != settings.CLUB_APP_HOST:
+            return HttpResponseRedirect("https://" + settings.CLUB_APP_HOST + request.get_full_path())
+

         if self.is_app():
             request.session['from_app'] = True
         elif request.session and 'from_app' in request.session:
             del request.session['from_app']
         if self.is_app():
             request.session['from_app'] = True
         elif request.session and 'from_app' in request.session:
             del request.session['from_app']

-        schedule = get_active_schedule(request.user)
-        if schedule is not None:
-            return HttpResponseRedirect(schedule.get_absolute_url())
-        else:
-            return super(JoinView, self).get(request)
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['request'] = self.request
-        return kwargs
-
-    def get_context_data(self, form=None):
-        c = super(JoinView, self).get_context_data()
+        #schedule = get_active_schedule(request.user)
+        #if schedule is not None:
+        #    return HttpResponseRedirect(schedule.get_absolute_url())
+        #else:
+        return super(JoinView, self).get(request)
+
+    def get_context_data(self, **kwargs):
+        c = super(JoinView, self).get_context_data(**kwargs)

         c['membership'] = getattr(self.request.user, 'membership', None)
         c['membership'] = getattr(self.request.user, 'membership', None)

+        c['active_menu_item'] = 'club'
+        c['club'] = models.Club.objects.first()
+
+        c['ambassador'] = models.Ambassador.objects.all().order_by('?').first()

         return c
 
     def get_initial(self):
         return c
 
     def get_initial(self):


@@ -60,11 +74,17 @@ class JoinView(CreateView):
         return self.object.initiate_payment(self.request)
 
 
         return self.object.initiate_payment(self.request)
 
 

+@method_decorator(never_cache, name='dispatch')

 class ScheduleView(DetailView):
     model = models.Schedule
     slug_field = slug_url_kwarg = 'key'
     template_name = 'club/schedule.html'
 
 class ScheduleView(DetailView):
     model = models.Schedule
     slug_field = slug_url_kwarg = 'key'
     template_name = 'club/schedule.html'
 

+    def get_context_data(self, *args, **kwargs):
+        ctx = super().get_context_data(*args, **kwargs)
+        ctx['active_menu_item'] = 'club'
+        return ctx
+

     def post(self, request, key):
         schedule = self.get_object()
         return HttpResponseRedirect(schedule.initiate_payment(request))
     def post(self, request, key):
         schedule = self.get_object()
         return HttpResponseRedirect(schedule.initiate_payment(request))


@@ -99,8 +119,14 @@ class DummyPaymentView(TemplateView):
         return HttpResponseRedirect(schedule.get_absolute_url())
 
 
         return HttpResponseRedirect(schedule.get_absolute_url())
 
 

-class PayUPayment(payu_views.Payment):
-    pass
+class PayUPayment(DetailView):
+    model = models.Schedule
+    slug_field = slug_url_kwarg = 'key'
+
+    def get(self, request, key):
+        schedule = self.get_object()
+        return HttpResponseRedirect(schedule.initiate_payment(request))
+

 
 
 class PayURecPayment(payu_views.RecPayment):
 
 
 class PayURecPayment(payu_views.RecPayment):


@@ -110,7 +136,7 @@ class PayURecPayment(payu_views.RecPayment):
         return get_object_or_404(models.Schedule, key=self.kwargs['key'])
 
     def get_pos(self):
         return get_object_or_404(models.Schedule, key=self.kwargs['key'])
 
     def get_pos(self):

-        pos_id = payure_method.pos_id
+        pos_id = recurring_payment_method.pos_id

         return POSS[pos_id]
 
     def get_success_url(self):
         return POSS[pos_id]
 
     def get_success_url(self):


@@ -130,3 +156,15 @@ class MembershipView(UpdateView):
 
     def get_object(self):
         return self.request.user.membership
 
     def get_object(self):
         return self.request.user.membership

+
+
+class ScheduleThanksView(DetailView):
+    model = models.Schedule
+    slug_field = slug_url_kwarg = 'key'
+    template_name = 'club/thanks.html'
+
+    def get_context_data(self, *args, **kwargs):
+        ctx = super().get_context_data(*args, **kwargs)
+        ctx['active_menu_item'] = 'club'
+        return ctx
+