Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pytition/petition/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from . import views
from .forms import PytitionUserCreationForm
from .views import PetitionCreationWizard, PytitionUserCreateView
from .views import PetitionCreationWizard, PytitionUserCreateView, PytitionLoginView
from django.views.generic import RedirectView
from django.urls import reverse_lazy
from django.conf import settings
Expand Down Expand Up @@ -61,7 +61,8 @@
path('wizard/org/<slug:orgslugname>/new_petition/from_template/<int:template_id>', PetitionCreationWizard.as_view(views.WizardForms), name='org_petition_wizard_from_template'),
path('wizard/user/new_petition', PetitionCreationWizard.as_view(views.WizardForms), name='user_petition_wizard'),
path('wizard/user/new_petition/from_template/<template_id>', PetitionCreationWizard.as_view(views.WizardForms), name='user_petition_wizard_from_template'),
# Authentication
# Authentication - Custom login view that redirects authenticated users
path('login/', PytitionLoginView.as_view(), name='login'),
path('', include('django.contrib.auth.urls')),
path('account_settings', views.account_settings, name="account_settings"),
# Misc
Expand Down
21 changes: 21 additions & 0 deletions pytition/petition/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import User
from django.contrib.auth.forms import PasswordChangeForm
from django.contrib.auth.views import LoginView
from django.urls import reverse
from django.utils.decorators import method_decorator
from django.utils.timezone import now
Expand Down Expand Up @@ -1785,8 +1786,16 @@ def search_users_and_orgs(request):
return JsonResponse(result)


# User registration view that redirects authenticated users
class PytitionUserCreateView(CreateView):

def dispatch(self, request, *args, **kwargs):
# If user is already authenticated, redirect them to the index page
if request.user.is_authenticated:
messages.info(request, _("You are already logged in."))
return redirect('index')
return super().dispatch(request, *args, **kwargs)

def save_numbers(self, request):
request.session['random_a'] = self.a
request.session['random_b'] = self.b
Expand Down Expand Up @@ -1818,6 +1827,18 @@ def form_valid(self, form):
form.send_success_email()
return super().form_valid(form)


# Login view that redirects authenticated users
class PytitionLoginView(LoginView):
redirect_authenticated_user = True

def get_redirect_url(self):
# If user is already authenticated, redirect to index
if self.request.user.is_authenticated:
return reverse('index')
return super().get_redirect_url()


# /<int:petition_id>/report/<int:reason_id>
# Report a petition to moderation
def report_petition(request, petition_id, reason_id=None):
Expand Down