diff --git a/navbar/templates/navbar/navbar.html b/navbar/templates/navbar/navbar.html index 7e07f9c..93bb9c5 100644 --- a/navbar/templates/navbar/navbar.html +++ b/navbar/templates/navbar/navbar.html @@ -41,6 +41,7 @@
{% trans "my_account"|capfirst %}
+ {% trans "settings"|capfirst %} {% if user.is_superuser %} {% trans "administration"|capfirst %} {% endif %} diff --git a/neluser/forms.py b/neluser/forms.py index 73b73bb..088165a 100644 --- a/neluser/forms.py +++ b/neluser/forms.py @@ -1,5 +1,9 @@ +from django.contrib.auth.password_validation import validate_password from django.contrib.auth.forms import UserCreationForm from django.utils.translation import gettext_lazy as _ +from django.core.exceptions import ValidationError +from django.contrib import messages +from django import forms from .models import NelUser @@ -7,3 +11,27 @@ class RegistrationForm(UserCreationForm): class Meta: model = NelUser fields = (NelUser.EMAIL_FIELD,) + +class ChangePasswordForm(forms.Form): + current_password = forms.CharField(label=_('current_password'), widget=forms.PasswordInput) + new_password = forms.CharField(label=_('new_password'), widget=forms.PasswordInput) + new_password_confirm = forms.CharField(label=_('new_password_confirm'), widget=forms.PasswordInput) + + def __init__(self, *args, **kwargs): + self.request = kwargs.pop('request') + return super().__init__(*args, **kwargs) + + def clean(self): + cleaned_data = super().clean() + old_pass = cleaned_data.get('current_password') + new_pass = cleaned_data.get('new_password') + new_pass_confirm = cleaned_data.get('new_password_confirm') + user = self.request.user + if new_pass != new_pass_confirm: + raise forms.ValidationError(_('The new password does not match its confirmation.')) + try: + validate_password(new_pass, user=user) + except ValidationError as error: + raise forms.ValidationError(error) + if not user.check_password(old_pass): + raise forms.ValidationError(_('The current password is incorrect.')) diff --git a/neluser/locale/en/LC_MESSAGES/django.po b/neluser/locale/en/LC_MESSAGES/django.po index bbe87df..4e571ee 100644 --- a/neluser/locale/en/LC_MESSAGES/django.po +++ b/neluser/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-03 23:12+0200\n" +"POT-Creation-Date: 2018-11-08 14:17+0100\n" "PO-Revision-Date: 2018-02-04 01:03+0100\n" "Last-Translator: Khaganat \n" "Language-Team: Khaganat \n" @@ -12,6 +12,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: forms.py:16 +msgid "current_password" +msgstr "Please provide your current password" + +#: forms.py:17 +msgid "new_password" +msgstr "Please set a new password" + +#: forms.py:18 +msgid "new_password_confirm" +msgstr "Please confirm the new password" + +#: forms.py:31 +msgid "The new password does not match its confirmation." +msgstr "" + +#: forms.py:37 +msgid "The current password is incorrect." +msgstr "" + #: models.py:40 msgid "email" msgstr "" @@ -120,6 +140,7 @@ msgid "set_new_password" msgstr "Please set a new password" #: templates/neluser/password_reset_confirm.html:13 +#: templates/neluser/settings/security/password.html:11 msgid "change_my_password" msgstr "change my password" @@ -172,3 +193,11 @@ msgstr "" #: templates/neluser/register_done.html:9 msgid "take_me_home" msgstr "Take me home" + +#: templates/neluser/settings/base.html:8 +msgid "security" +msgstr "" + +#: templates/neluser/settings/security/password.html:5 +msgid "Password" +msgstr "" diff --git a/neluser/locale/fr/LC_MESSAGES/django.po b/neluser/locale/fr/LC_MESSAGES/django.po index e95ebd6..ca164d2 100644 --- a/neluser/locale/fr/LC_MESSAGES/django.po +++ b/neluser/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-03 23:12+0200\n" +"POT-Creation-Date: 2018-11-08 14:17+0100\n" "PO-Revision-Date: 2018-02-04 01:03+0100\n" "Last-Translator: Khaganat \n" "Language-Team: Khaganat \n" @@ -12,6 +12,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: forms.py:16 +msgid "current_password" +msgstr "Veuillez indiquer votre mot de passe actuel" + +#: forms.py:17 +msgid "new_password" +msgstr "Veuillez indiquer un nouveau mot de passe" + +#: forms.py:18 +msgid "new_password_confirm" +msgstr "Veuillez confirmer le nouveau mot de passe" + +#: forms.py:31 +msgid "The new password does not match its confirmation." +msgstr "Le nouveau mot de passe ne correspond pas avec sa confirmation." + +#: forms.py:37 +msgid "The current password is incorrect." +msgstr "Le mot de passe actuel est incorrect." + #: models.py:40 msgid "email" msgstr "adresse électronique" @@ -122,6 +142,7 @@ msgid "set_new_password" msgstr "Veuillez indiquer un nouveau mot de passe" #: templates/neluser/password_reset_confirm.html:13 +#: templates/neluser/settings/security/password.html:11 msgid "change_my_password" msgstr "Modifier mon mot de passe" @@ -178,6 +199,14 @@ msgstr "" msgid "take_me_home" msgstr "Retour à l'accueil" +#: templates/neluser/settings/base.html:8 +msgid "security" +msgstr "sécurité" + +#: templates/neluser/settings/security/password.html:5 +msgid "Password" +msgstr "Mot de passe" + #~ msgid "NSFW content" #~ msgstr "Contenu sensible" diff --git a/neluser/templates/neluser/settings/base.html b/neluser/templates/neluser/settings/base.html new file mode 100644 index 0000000..aecf5a1 --- /dev/null +++ b/neluser/templates/neluser/settings/base.html @@ -0,0 +1,13 @@ +{% extends "khaganat/base.html" %} +{% load bulma_tags %} +{% load i18n %} + +{% block content %} +
+
    + + {% include "neluser/settings/tab.html" with tabname="security" lnk="password_change" %} +
+
+{% block pannel %}{% endblock %} +{% endblock %} diff --git a/neluser/templates/neluser/settings/security/base.html b/neluser/templates/neluser/settings/security/base.html new file mode 100644 index 0000000..f1e1921 --- /dev/null +++ b/neluser/templates/neluser/settings/security/base.html @@ -0,0 +1,5 @@ +{% extends "neluser/settings/base.html" %} + +{% block pannel %} +{% block inner_pannel %}{% endblock %} +{% endblock %} diff --git a/neluser/templates/neluser/settings/security/password.html b/neluser/templates/neluser/settings/security/password.html new file mode 100644 index 0000000..295956c --- /dev/null +++ b/neluser/templates/neluser/settings/security/password.html @@ -0,0 +1,13 @@ +{% extends "neluser/settings/security/base.html" %} +{% load bulma_tags %} +{% load i18n %} + +{% block title %}{% trans "Password"|capfirst %}{% endblock %} + +{% block inner_pannel %} +
+ {% csrf_token %} + {{ form|bulma }} + +
+{% endblock %} diff --git a/neluser/templates/neluser/settings/tab.html b/neluser/templates/neluser/settings/tab.html new file mode 100644 index 0000000..bb573f5 --- /dev/null +++ b/neluser/templates/neluser/settings/tab.html @@ -0,0 +1,5 @@ +{% load i18n %} + + + {% trans tabname|capfirst %} + diff --git a/neluser/urls.py b/neluser/urls.py index c53989e..0c66d64 100644 --- a/neluser/urls.py +++ b/neluser/urls.py @@ -4,7 +4,7 @@ from . import views urlpatterns = [ - # login/logout + # Login and logout path( 'login/', auth_views.LoginView.as_view(template_name='neluser/login.html'), @@ -16,20 +16,11 @@ urlpatterns = [ name='logout' ), - # account activation + # Account activation path('register/', views.register, name='register'), path('activate///', views.activate, name='activate'), - # settings - path('settings/', views.profile, name='settings'), - path('settings/password/', views.profile, name='password_change'), - path( - 'settings/password/change/done/', - views.profile, - name='password_change_done' - ), - - # forgotten_password + # Forgotten password path( 'forgotten_password/', auth_views.PasswordResetView.as_view( @@ -61,4 +52,12 @@ urlpatterns = [ ), name='password_reset_complete' ), + + # -------- + # Settings + # -------- + path('settings/', views.settings_default, name='settings'), + + # Security + path('settings/security/password/', views.ChangePasswordView.as_view(), name='password_change'), ] diff --git a/neluser/views.py b/neluser/views.py index f28ba46..47c3963 100644 --- a/neluser/views.py +++ b/neluser/views.py @@ -1,18 +1,48 @@ from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import redirect, render, get_object_or_404 from django.contrib.auth.tokens import default_token_generator from django.contrib.sites.shortcuts import get_current_site +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin from django.template.loader import render_to_string from django.core.mail import EmailMultiAlternatives +from django.views.generic.edit import FormView from django.utils.encoding import force_bytes from django.http import HttpResponse, Http404 from django.conf import settings -from .forms import RegistrationForm +from django.urls import reverse_lazy +from .forms import RegistrationForm, ChangePasswordForm from .models import NelUser -def profile(request): - return HttpResponse('

lol

') +@login_required +def settings_default(request): + next_page = reverse_lazy('password_change') + return redirect(next_page) + + +class ChangePasswordView(LoginRequiredMixin, FormView): + template_name = 'neluser/settings/security/password.html' + form_class = ChangePasswordForm + success_url = reverse_lazy('password_change') + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['tab'] = 'security' + context['block'] = 'password' + return context + + def get_form_kwargs(self): + kw = super().get_form_kwargs() + kw['request'] = self.request + return kw + + def form_valid(self, form): + new_password = form.cleaned_data['new_password'] + user = self.request.user + user.set_password(new_password) + user.save() + return super().form_valid(form) def send_activation_email(request, user):