Merge branch 'master' into Develop

2020-05-13 20:16:29 +02:00 · 2020-05-13 20:16:29 +02:00 · 13994a5f96
parent 273572f44c e8ac62cdd8
commit 13994a5f96
1 changed files with 2 additions and 2 deletions
--- a/cps/helper.py
+++ b/cps/helper.py
@ -451,11 +451,11 @@ def reset_password(user_id):
    existing_user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
    if not existing_user:
        return 0, None
-    password = generate_random_password()
-    existing_user.password = generate_password_hash(password)
    if not config.get_mail_server_configured():
        return 2, None
    try:
+        password = generate_random_password()
+        existing_user.password = generate_password_hash(password)
        ub.session.commit()
        send_registration_mail(existing_user.email, existing_user.nickname, password, True)
        return 1, existing_user.nickname