Self hosted FLOSS fitness/workout, nutrition and weight tracker
Refactor the user preferences page
Roland Geiderb5ec984096ef
diff --git a/wger/core/forms.py b/wger/core/forms.pyindex 549621309..7e09a9d6f 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -29,6 +29,7 @@ from django.forms import (Form,PasswordInput,)+from django.utils.text import format_lazyfrom django.utils.translation import (gettext as _,gettext_lazy,@@ -42,7 +43,6 @@ from allauth.account.forms import (from allauth.account.utils import filter_users_by_emailfrom crispy_forms.helper import FormHelperfrom crispy_forms.layout import (- HTML,ButtonHolder,Column,Fieldset,@@ -274,7 +274,44 @@ class PasswordConfirmationForm(Form):password = self.cleaned_data.get('password', None)if not self.user.check_password(password):raise ValidationError(_('Invalid password'))- return self.cleaned_data.get('password')+ return password+++class UsernameConfirmationForm(Form):+ """+ A username confirmation form.++ Same purpose as PasswordConfirmationForm, but for accounts without a usable+ password (e.g. social logins, which have no password to check): the user+ confirms by typing the exact username of the account being acted on.+ """++ username = CharField(label=gettext_lazy('Confirm'))++ def __init__(self, user, confirm_username=None, data=None):+ self.user = user+ self.confirm_username = confirm_username or user.username+ super().__init__(data=data)+ self.fields['username'].help_text = format_lazy(+ gettext_lazy(+ 'Your account has no password. Type the username "{username}" to confirm.'+ ),+ username=self.confirm_username,+ )+ self.helper = FormHelper()+ self.helper.layout = Layout(+ 'username',+ ButtonHolder(Submit('submit', _('Delete'), css_class='btn-danger btn-block')),+ )++ def clean_username(self):+ """+ Check that the typed username matches the account being acted on+ """+ username = self.cleaned_data.get('username', None)+ if username != self.confirm_username:+ raise ValidationError(_('The entered username does not match'))+ return usernameclass PasswordResetFormCaptcha(PasswordResetForm):diff --git a/wger/core/migrations/0026_alter_userprofile_birthdate_alter_userprofile_height.py b/wger/core/migrations/0026_alter_userprofile_birthdate_alter_userprofile_height.pyindex 33f2f661e..587a93ab3 100644--- a/wger/core/migrations/0026_alter_userprofile_birthdate_alter_userprofile_height.py+++ b/wger/core/migrations/0026_alter_userprofile_birthdate_alter_userprofile_height.py@@ -15,11 +15,11 @@ class Migration(migrations.Migration):migrations.AlterField(model_name='userprofile',name='birthdate',- field=models.DateField(blank=True, null=True, validators=[wger.core.models.profile.birthdate_validator], verbose_name='Date of Birth'),+ field=models.DateField(blank=True, null=True, validators=[wger.core.models.profile.birthdate_validator], verbose_name='Date of Birth',),),migrations.AlterField(model_name='userprofile',name='height',- field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(140), django.core.validators.MaxValueValidator(230)], verbose_name='Height (cm)'),+ field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(140), django.core.validators.MaxValueValidator(230)], verbose_name='Height (cm)',),),]diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.htmlindex c94275c3e..3ba944de4 100644--- a/wger/core/templates/user/preferences.html+++ b/wger/core/templates/user/preferences.html@@ -13,25 +13,76 @@{% block sidebar %}- {% if email_verified %}- <p>- <span class="{% fa_class 'envelope-circle-check' %} text-success"></span>- {% translate "Verified email" %}- </p>- {% else %}- <p>- <span class="{% fa_class 'envelope' %}"></span>- {% translate "Unverified email" %}- </p>- {% endif %}- <p>- <a href="{% url 'account_email' %}">{% translate "Manage email address" %}</a>- </p>- <p>- <small class="text-muted">- {% translate "You need to verify your email to contribute exercises" %}- </small>- </p>+ <div class="card mb-3">+ <div class="card-header">+ <span class="{% fa_class 'shield-halved' %} me-1"></span>+ {% translate "Account & security" %}+ </div>+ <div class="list-group list-group-flush">+ <a href="{% url 'account_email' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'envelope' %} me-2 text-muted"></span>+ {% translate "Email address" %}+ {% if email_verified %}+ <small class="d-block ms-4 text-success">{% translate "Verified email" %}</small>+ {% else %}+ <small class="d-block ms-4 text-muted">{% translate "Unverified email" %}</small>+ {% endif %}+ </a>+ {% if has_usable_password %}+ <a href="{% url 'core:user:change-password' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'key' %} me-2 text-muted"></span>+ {% translate "Change password" %}+ </a>+ {% else %}+ <a href="{% url 'account_set_password' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'key' %} me-2 text-muted"></span>+ {% translate "Set password" %}+ </a>+ {% endif %}+ <a href="{% url 'mfa_index' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'shield-halved' %} me-2 text-muted"></span>+ {% translate "Two-factor authentication" %}+ {% if mfa_enabled %}+ <span class="badge text-bg-success ms-1">{% translate "On" %}</span>+ {% else %}+ <span class="badge text-bg-secondary ms-1">{% translate "Off" %}</span>+ {% endif %}+ </a>+ {% get_providers as socialaccount_providers %}+ {% if socialaccount_providers %}+ <a href="{% url 'socialaccount_connections' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'link' %} me-2 text-muted"></span>+ {% translate "Connected accounts" %}+ </a>+ {% endif %}+ <a href="{% url 'core:user:api-key' %}" class="list-group-item list-group-item-action">+ <span class="{% fa_class 'chevron-right' %} float-end text-muted"></span>+ <span class="{% fa_class 'globe' %} me-2 text-muted"></span>+ {% translate "API key" %}+ </a>+ </div>+ </div>++ <div class="card border-danger mb-3">+ <div class="card-header text-danger">+ <span class="{% fa_class 'trash' %} me-1"></span>+ {% translate "Danger zone" %}+ </div>+ <div class="card-body">+ <p class="card-text">+ <small class="text-muted">+ {% translate "Your account and all training data will be permanently deleted." %}+ </small>+ </p>+ {% translate 'Delete account' as text %}+ {% modal_link url='core:user:delete' text=text css_class='btn btn-outline-danger btn-sm' %}+ </div>+ </div>{% endblock %}@@ -40,44 +91,4 @@{# Options #}{# #}{% block options %}- <div class="btn-group">- <div class="btn-group" role="group">- <button type="button"- class="btn btn-primary btn-sm dropdown-toggle"- data-bs-toggle="dropdown"- aria-haspopup="true"- aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% translate "Options" %}- </button>- <div class="dropdown-menu">- <a href="{% url 'account_email' %}" class="dropdown-item">- <span class="{% fa_class 'envelope' %}"></span>- {% translate "Email address" %}- </a>- <a href="{% url 'core:user:change-password' %}" class="dropdown-item">- <span class="{% fa_class 'key' %}"></span>- {% translate "Change password" %}- </a>- <a href="{% url 'mfa_index' %}" class="dropdown-item">- <span class="{% fa_class 'shield-halved' %}"></span>- {% translate "Two-factor authentication" %}- </a>- {% get_providers as socialaccount_providers %}- {% if socialaccount_providers %}- <a href="{% url 'socialaccount_connections' %}" class="dropdown-item">- <span class="{% fa_class 'link' %}"></span>- {% translate "Connected accounts" %}- </a>- {% endif %}- <a href="{% url 'core:user:api-key' %}" class="dropdown-item">- <span class="{% fa_class 'globe' %}"></span>- {% translate "API key" %}- </a>- <div role="separator" class="dropdown-divider"></div>- {% translate 'Delete account' as text %}- {% modal_link url='core:user:delete' text=text css_class='dropdown-item' %}- </div>- </div>- </div>{% endblock %}diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.pyindex 7f41f7d71..bb913ec93 100644--- a/wger/core/tests/test_delete_user.py+++ b/wger/core/tests/test_delete_user.py@@ -82,6 +82,36 @@ class DeleteUserTestCase(WgerTestCase):self.delete_user(fail=True)+class DeleteUserWithoutPasswordTestCase(WgerTestCase):+ """+ Accounts without a usable password (e.g. social logins) confirm the+ deletion by typing their username instead of a password.+ """++ def setUp(self):+ super().setUp()+ self.user = User.objects.create(username='socialuser', email='[email protected]')+ self.user.set_unusable_password()+ self.user.save()+ self.client.force_login(self.user)++ def test_form_asks_for_username(self):+ response = self.client.get(reverse('core:user:delete'))+ self.assertEqual(response.status_code, 200)+ self.assertContains(response, 'name="username"')+ self.assertNotContains(response, 'name="password"')++ def test_wrong_username_does_not_delete(self):+ response = self.client.post(reverse('core:user:delete'), {'username': 'not-my-name'})+ self.assertEqual(response.status_code, 200)+ self.assertEqual(User.objects.filter(username='socialuser').count(), 1)++ def test_correct_username_deletes(self):+ response = self.client.post(reverse('core:user:delete'), {'username': 'socialuser'})+ self.assertEqual(response.status_code, 302)+ self.assertEqual(User.objects.filter(username='socialuser').count(), 0)++class DeleteUserByAdminTestCase(WgerTestCase):"""Tests deleting a user account by a gym administratordiff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.pyindex 042484b1b..f7fda335f 100644--- a/wger/core/tests/test_preferences.py+++ b/wger/core/tests/test_preferences.py@@ -108,6 +108,24 @@ class PreferencesTestCase(WgerTestCase):self.assertEqual(response.status_code, 302)self.assertIsNone(User.objects.get(username='test').userprofile.height)+ def test_change_password_link_for_password_user(self):+ """Accounts with a usable password see the change-password link."""+ self.user_login('test')+ response = self.client.get(reverse('core:user:preferences'))+ self.assertContains(response, reverse('core:user:change-password'))+ self.assertNotContains(response, reverse('account_set_password'))++ def test_set_password_link_for_passwordless_user(self):+ """Accounts without a usable password see a set-password link instead."""+ user = User.objects.create(username='socialprefs', email='[email protected]')+ user.set_unusable_password()+ user.save()+ self.client.force_login(user)++ response = self.client.get(reverse('core:user:preferences'))+ self.assertContains(response, reverse('account_set_password'))+ self.assertNotContains(response, reverse('core:user:change-password'))+def test_email_is_not_editable_from_preferences(self):"""Email management was moved to allauth's EmailView: the preferencesdiff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 0da7f6104..3e56ba525 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -72,6 +72,7 @@ from allauth.account.views import (LoginView as AllauthLoginView,SignupView as AllauthSignupView,)+from allauth.mfa.utils import is_mfa_enabledfrom crispy_forms.helper import FormHelperfrom crispy_forms.layout import (ButtonHolder,@@ -86,6 +87,7 @@ from rest_framework.authtoken.models import Tokenfrom wger.core.forms import (PasswordConfirmationForm,PasswordResetFormCaptcha,+ UsernameConfirmationForm,UserPersonalInformationForm,UserPreferencesForm,)@@ -163,24 +165,30 @@ def delete(request, user_pk=None):else:user = request.user- form = PasswordConfirmationForm(user=request.user)+ # Accounts without a usable password (e.g. social logins) can't confirm with+ # a password, so they confirm by typing the username instead.+ data = request.POST or None+ if request.user.has_usable_password():+ form = PasswordConfirmationForm(user=request.user, data=data)+ else:+ form = UsernameConfirmationForm(+ user=request.user, confirm_username=user.username, data=data+ )- if request.method == 'POST':- form = PasswordConfirmationForm(data=request.POST, user=request.user)- if form.is_valid():- user.delete()- messages.success(- request, _('Account "{0}" was successfully deleted').format(user.username)- )+ if request.method == 'POST' and form.is_valid():+ user.delete()+ messages.success(+ request, _('Account "{0}" was successfully deleted').format(user.username)+ )- if not user_pk:- django_logout(request)- return HttpResponseRedirect(reverse('software:features'))- else:- gym_pk = request.user.userprofile.gym_id- if gym_pk is None:- return HttpResponseRedirect(reverse('core:dashboard'))- return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))+ if not user_pk:+ django_logout(request)+ return HttpResponseRedirect(reverse('software:features'))+ else:+ gym_pk = request.user.userprofile.gym_id+ if gym_pk is None:+ return HttpResponseRedirect(reverse('core:dashboard'))+ return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))form.helper.form_action = request.pathcontext = {'form': form, 'user_delete': user}@@ -317,6 +325,8 @@ def preferences(request):context['form'] = formcontext['email_verified'] = request.user.userprofile.is_verified+ context['mfa_enabled'] = is_mfa_enabled(request.user)+ context['has_usable_password'] = request.user.has_usable_password()return render(request, 'user/preferences.html', context)diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.htmlindex 948be3660..32b9c7971 100644--- a/wger/gym/templates/gym/member_list.html+++ b/wger/gym/templates/gym/member_list.html@@ -41,15 +41,15 @@{{current_user.obj}}{% if current_user.perms.gym_trainer %}- <span class="badge badge-primary">{% translate "Trainer" %}</span>+ <span class="badge text-bg-primary">{% translate "Trainer" %}</span>{% endif %}{% if current_user.perms.manage_gym %}- <span class="badge badge-primary">{% translate "Gym manager" %}</span>+ <span class="badge text-bg-primary">{% translate "Gym manager" %}</span>{% endif %}{% if current_user.perms.manage_gyms %}- <span class="badge badge-primary">{% translate "General manager" %}</span>+ <span class="badge text-bg-primary">{% translate "General manager" %}</span>{% endif %}</td><td>