Self hosted FLOSS fitness/workout, nutrition and weight tracker
Replace the login view with allauth's
Roland Geidera19f3bdeb17c
diff --git a/settings/settings_global.py b/settings/settings_global.pyindex fab7ae705..97da968a9 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -238,6 +238,15 @@ ACCOUNT_LOGIN_METHODS = {'username', 'email'}# confirmed via the verification link.ACCOUNT_CHANGE_EMAIL = True+# Use wger's login form (allauth's LoginForm + the password-visibility toggle).+ACCOUNT_FORMS = {'login': 'wger.core.forms.WgerLoginForm'}++# django-axes handles login brute-force protection at the backend level (it+# wraps every authenticate() call, so it also covers the API login endpoints).+# Disable allauth's overlapping login throttles to avoid running two systems;+# the non-login limits (signup, password reset, ...) stay at allauth's defaults.+ACCOUNT_RATE_LIMITS = {'login_failed': None, 'login': None}+## Login#diff --git a/wger/core/forms.py b/wger/core/forms.pyindex f05d02082..99562a0c6 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -39,6 +39,7 @@ from django.utils.translation import ()# Third Party+from allauth.account.forms import LoginForm as AllauthLoginFormfrom allauth.account.utils import filter_users_by_emailfrom crispy_forms.helper import FormHelperfrom crispy_forms.layout import (@@ -125,6 +126,17 @@ class UserLoginForm(AuthenticationForm):self.confirm_login_allowed(self.user_cache)+class WgerLoginForm(AllauthLoginForm):+ """allauth's login form with wger's password-visibility toggle widget."""++ def __init__(self, *args, **kwargs):+ super().__init__(*args, **kwargs)+ self.fields['login'].widget.attrs['class'] = 'form-control'+ self.fields['password'].widget = PasswordInputWithToggle(+ attrs={'autocomplete': 'current-password'}+ )++class UserPreferencesForm(forms.ModelForm):first_name = forms.CharField(label=gettext_lazy('First name'), required=False)last_name = forms.CharField(label=gettext_lazy('Last name'), required=False)diff --git a/wger/core/templates/account/login.html b/wger/core/templates/account/login.htmlnew file mode 100644index 000000000..b3ef92497--- /dev/null+++ b/wger/core/templates/account/login.html@@ -0,0 +1,78 @@+{% extends "base.html" %}+{% load i18n wger_extras %}++{% block title %}{% translate "Login" %}{% endblock %}+++{% block header %}+{% endblock %}+++{% block content %}+ <form method="post" class="wger-form" novalidate>+ {% csrf_token %}+ {% if redirect_field_value %}+ <input type="hidden"+ name="{{ redirect_field_name }}"+ value="{{ redirect_field_value }}">+ {% endif %}++ {% for error in form.non_field_errors %}+ <div class="alert alert-danger">{{ error }}</div>+ {% endfor %}++ <div class="mb-3">+ <label for="{{ form.login.id_for_label }}" class="form-label">+ {{ form.login.label }}+ </label>+ {{ form.login }}+ {% for error in form.login.errors %}+ <div class="invalid-feedback d-block">{{ error }}</div>+ {% endfor %}+ </div>++ <div class="mb-3">+ <label for="{{ form.password.id_for_label }}" class="form-label">+ {{ form.password.label }}+ </label>+ {{ form.password }}+ {% for error in form.password.errors %}+ <div class="invalid-feedback d-block">{{ error }}</div>+ {% endfor %}+ </div>++ {% if form.remember %}+ <div class="form-check mb-3">+ {{ form.remember }}+ <label for="{{ form.remember.id_for_label }}" class="form-check-label">+ {{ form.remember.label }}+ </label>+ </div>+ {% endif %}++ <button type="submit" class="btn btn-success btn-block">+ {% translate "Login" %}+ </button>+ </form>+{% endblock %}+++{% block sidebar %}+ {% if allow_registration %}+ <h4>{% translate "No account?" %}</h4>+ <p>+ <a href="{% url 'core:user:registration' %}">+ <span class="{% fa_class 'sign-in-alt' %}"></span>+ {% translate "Register" %}+ </a>+ </p>+ {% endif %}++ <h4>{% translate "Forgot password?" %}</h4>+ <p>+ <a href="{% url 'core:user:password_reset' %}">+ <span class="{% fa_class 'key' %}"></span>+ {% translate "Reset password" %}+ </a>+ </p>+{% endblock %}diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.htmldeleted file mode 100644index 04137919d..000000000--- a/wger/core/templates/user/login.html+++ /dev/null@@ -1,33 +0,0 @@-{% extends "base.html" %}-{% load i18n static wger_extras crispy_forms_tags %}--{% block title %}{% translate "Login" %}{% endblock %}---{% block header %}-{% endblock %}--{% block content %}- {% crispy form %}-{% endblock %}---{% block sidebar %}-{% if allow_registration %}-<h4>{% translate "No account?" %}</h4>-<p>- <a href="{% url 'core:user:registration' %}">- <span class="{% fa_class 'sign-in-alt' %}"></span>- {% translate "Register" %}- </a>-</p>-{% endif %}--<h4>{% translate "Forgot password?" %}</h4>-<p>- <a href="{% url 'core:user:password_reset' %}" >- <span class="{% fa_class 'key' %}"></span>- {% translate "Reset password" %}- </a>-</p>-{% endblock %}diff --git a/wger/core/tests/test_user_login.py b/wger/core/tests/test_user_login.pyindex a98e43858..cc8978ff4 100644--- a/wger/core/tests/test_user_login.py+++ b/wger/core/tests/test_user_login.py@@ -1,6 +1,10 @@# Standard Libraryfrom unittest import mock+# Django+from django.contrib.auth.models import User+from django.urls import reverse+# Third Partyfrom rest_framework import statusfrom rest_framework.exceptions import ErrorDetail@@ -176,3 +180,37 @@ class JwtTokenEmailLoginTestCase(BaseTestCase, ApiBaseTestCase):{'username': '[email protected]', 'password': 'wrong-password'},)self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)+++class WebLoginViewTestCase(WgerTestCase):+ """+ The web login view (core:user:login) is allauth's LoginView, with one wger+ carve-out: temporary (guest) users may still reach the login page.+ """++ def test_login_page_renders(self):+ response = self.client.get(reverse('core:user:login'))+ self.assertEqual(response.status_code, 200)+ self.assertTemplateUsed(response, 'account/login.html')++ def test_login_via_view_succeeds(self):+ response = self.client.post(+ reverse('core:user:login'),+ {'login': 'test', 'password': 'testtest'},+ )+ self.assertEqual(response.status_code, 302)+ self.assertEqual(int(self.client.session['_auth_user_id']), 2)++ def test_authenticated_user_is_redirected_away(self):+ self.user_login('test')+ response = self.client.get(reverse('core:user:login'))+ self.assertEqual(response.status_code, 302)++ def test_temporary_user_can_reach_login_page(self):+ user = User.objects.get(username='test')+ user.userprofile.is_temporary = True+ user.userprofile.save()+ self.user_login('test')++ response = self.client.get(reverse('core:user:login'))+ self.assertEqual(response.status_code, 200)diff --git a/wger/core/urls.py b/wger/core/urls.pyindex eaf447578..24f7e7306 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -24,7 +24,6 @@ from django.urls import (from django.views.generic import TemplateView# wger-from wger.core.forms import UserLoginFormfrom wger.core.views import (languages,license,@@ -68,14 +67,7 @@ patterns_language = [# sub patterns for userpatterns_user = [- path(- 'login',- user.WgerLoginView.as_view(- template_name='user/login.html',- authentication_form=UserLoginForm,- ),- name='login',- ),+ path('login', user.WgerLoginView.as_view(), name='login'),path('logout', user.logout, name='logout'),path('delete', user.delete, name='delete'),path('<int:user_pk>/delete', user.delete, name='delete'),diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex a405bc725..9c139116b 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -33,7 +33,6 @@ from django.contrib.auth.mixins import ()from django.contrib.auth.models import Userfrom django.contrib.auth.views import (- LoginView,PasswordChangeView,PasswordResetConfirmView,PasswordResetView,@@ -45,7 +44,6 @@ from django.http import ()from django.shortcuts import (get_object_or_404,- redirect,render,)from django.template.context_processors import csrf@@ -68,7 +66,9 @@ from django.views.generic import ()# Third Party+from allauth.account.mixins import RedirectAuthenticatedUserMixinfrom allauth.account.models import EmailAddress+from allauth.account.views import LoginView as AllauthLoginViewfrom crispy_forms.helper import FormHelperfrom crispy_forms.layout import (ButtonHolder,@@ -706,15 +706,17 @@ class WgerPasswordResetConfirmView(PasswordResetConfirmView):return form-class WgerLoginView(LoginView):+class WgerLoginView(AllauthLoginView):"""- If the user is already logged in and there's a "next" parameter in the URL,- redirect there. Otherwise, proceed with the normal login logic from Django+ allauth's login view, with one wger carve-out: temporary (guest) users are+ still allowed to reach the login page so they can sign in as a real+ account. allauth would otherwise redirect every authenticated user away."""def dispatch(self, request, *args, **kwargs):- if request.user.is_authenticated and not request.user.userprofile.is_temporary:- return redirect(request.GET.get('next', reverse('core:dashboard')))-- # Proceed with the normal login page logic+ if request.user.is_authenticated and request.user.userprofile.is_temporary:+ # Skip RedirectAuthenticatedUserMixin's "already logged in" redirect+ return super(RedirectAuthenticatedUserMixin, self).dispatch(+ request, *args, **kwargs+ )return super().dispatch(request, *args, **kwargs)