- {% if current_user.is_administrator() %}
+
{% if current_user.is_anonymous %}
- connexion
diff --git a/app/templates/email/reset_password.html b/app/templates/email/reset_password.html
index 430d53ded..9e92a785e 100644
--- a/app/templates/email/reset_password.html
+++ b/app/templates/email/reset_password.html
@@ -5,7 +5,7 @@
cliquez sur ce lien
.
-Vous pouvez aussi copier ce lien dans votre navigateur Web::
+Vous pouvez aussi copier ce lien dans votre navigateur Web:
{{ url_for('auth.reset_password', token=token, _external=True) }}
Si vous n'avez pas demandé à réinitialiser votre mot de passe sur
diff --git a/app/views/users.py b/app/views/users.py
index 98d14f303..e1709c92a 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -38,10 +38,12 @@ import re
from xml.etree import ElementTree
import flask
-from flask import g, url_for, request, current_app
+from flask import g, url_for, request, current_app, flash
from flask import redirect, render_template
from flask_login import current_user
+from wtforms import HiddenField, PasswordField, StringField, SubmitField
+from wtforms.validators import DataRequired, Email, ValidationError, EqualTo
from app import db
from app.auth.forms import DeactivateUserForm
@@ -69,6 +71,41 @@ from app.scodoc.sco_import_users import generate_password
from app.scodoc.sco_permissions_check import can_handle_passwd
from app.scodoc.TrivialFormulator import TrivialFormulator, tf_error_message
from app.views import users_bp as bp
+from flask_wtf import FlaskForm
+
+_ = lambda x: x # sans babel
+_l = _
+
+
+class ChangePasswordForm(FlaskForm):
+ user_name = HiddenField()
+ old_password = PasswordField(_l("Ancien mot de passe"))
+ new_password = PasswordField(_l("Nouveau mot de passe"))
+ bis_password = PasswordField(
+ _l("Répéter"),
+ validators=[
+ EqualTo(
+ "new_password",
+ message="Les deux saisies sont " "différentes, recommencez",
+ ),
+ ],
+ )
+ email = StringField(_l("Email"), validators=[DataRequired(), Email()])
+ submit = SubmitField()
+ cancel = SubmitField("Annuler")
+
+ def validate_email(self, email):
+ user = User.query.filter_by(email=email.data).first()
+ if user is not None and self.user_name.data != user.user_name:
+ raise ValidationError(_("Adresse e-mail invalide"))
+
+ def validate_new_password(self, new_password):
+ if new_password.data != "" and not is_valid_password(new_password.data):
+ raise ValidationError(f"Mot de passe trop simple, recommencez")
+
+ def validate_old_password(self, old_password):
+ if not current_user.check_password(old_password.data):
+ raise ValidationError("Mot de passe actuel incorrect, ré-essayez")
@bp.route("/")
@@ -644,8 +681,31 @@ def import_users_form():
@scodoc
@permission_required(Permission.ScoUsersView)
@scodoc7func
-def user_info_page(user_name):
- return sco_users.user_info_page(user_name=user_name)
+def user_info_page(user_name=None):
+ """Display page of info about given user.
+ If user_name not specified, user current_user
+ """
+ from app.scodoc.sco_permissions_check import can_handle_passwd
+
+ # peut on divulguer ces infos ?
+ if not can_handle_passwd(current_user, allow_admindepts=True):
+ raise AccessDenied("Vous n'avez pas la permission de voir cette page")
+
+ dept = g.scodoc_dept
+ if not user_name:
+ user = current_user
+ else:
+ user = User.query.filter_by(user_name=user_name).first()
+ if not user:
+ raise ScoValueError("invalid user_name")
+
+ return render_template(
+ "auth/user_info_page.html",
+ user=user,
+ title=f"Utilisateur {user.user_name}",
+ Permission=Permission,
+ dept=dept,
+ )
@bp.route("/get_user_list_xml")
@@ -676,7 +736,7 @@ def get_user_list_xml(dept=None, start="", limit=25):
return scu.send_file(data, mime=scu.XML_MIMETYPE)
-@bp.route("/form_change_password")
+@bp.route("/form_change_password", methods=["GET", "POST"])
@scodoc
@permission_required(Permission.ScoView)
@scodoc7func
@@ -685,36 +745,42 @@ def form_change_password(user_name=None):
Un utilisateur peut toujours changer son propre mot de passe.
"""
if not user_name:
- u = current_user
+ user = current_user
else:
- u = User.query.filter_by(user_name=user_name).first()
- H = [html_sco_header.sco_header(user_check=False)]
- F = html_sco_header.sco_footer()
+ user = User.query.filter_by(user_name=user_name).first()
+
# check access
- if not can_handle_passwd(u):
- return (
- "\n".join(H)
- + "
Vous n'avez pas la permission de changer ce mot de passe
"
- + F
+ if not can_handle_passwd(user):
+ return "\n".join(
+ [
+ html_sco_header.sco_header(user_check=False),
+ "Vous n'avez pas la permission de changer ce mot de passe
",
+ html_sco_header.sco_footer(),
+ ]
)
- #
- H.append(
- """Changement du mot de passe de %(nomplogin)s
-
-