merge settings into users route

app/users/forms.py

@@ -2,6 +2,8 @@ from flask_wtf import FlaskForm
 from wtforms import (
     BooleanField,
     FileField,
+    PasswordField,
+    SelectField,
     StringField,
     SubmitField,
     TextAreaField,
@@ -10,10 +12,11 @@ from wtforms import (
 from wtforms.validators import (
     DataRequired,
     Email,
+    EqualTo,
     Length,
     Regexp
 )
-from app.models import User
+from app.models import User, UserSettingJobStatusMailNotificationLevel
 from app.auth import USERNAME_REGEX
 from app.wtf_validators import FileSizeLimit
 
@@ -98,3 +101,41 @@ class EditPrivacySettingsForm(FlaskForm):
     show_last_seen = BooleanField('Show last seen')
     show_member_since = BooleanField('Show member since')
     submit = SubmitField()
+
+class ChangePasswordForm(FlaskForm):
+    password = PasswordField('Old password', validators=[DataRequired()])
+    new_password = PasswordField(
+        'New password',
+        validators=[
+            DataRequired(),
+            EqualTo('new_password_2', message='Passwords must match')
+        ]
+    )
+    new_password_2 = PasswordField(
+        'New password confirmation',
+        validators=[
+            DataRequired(),
+            EqualTo('new_password', message='Passwords must match')
+        ]
+    )
+    submit = SubmitField()
+
+    def __init__(self, user, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.user = user
+
+    def validate_current_password(self, field):
+        if not self.user.verify_password(field.data):
+            raise ValidationError('Invalid password')
+
+
+class EditNotificationSettingsForm(FlaskForm):
+    job_status_mail_notification_level = SelectField(
+        'Job status mail notification level',
+        choices=[
+            (x.name, x.name.capitalize())
+            for x in UserSettingJobStatusMailNotificationLevel
+        ],
+        validators=[DataRequired()]
+    )
+    submit = SubmitField()

app/users/routes.py

@@ -16,6 +16,8 @@ from app import db
 from app.models import Avatar, Corpus, ProfilePrivacySettings, User
 from . import bp
 from .forms import (
+  ChangePasswordForm,
+  EditNotificationSettingsForm,  
   EditPrivacySettingsForm,
   EditProfileSettingsForm,
   EditPublicProfileInformationForm
@@ -74,6 +76,7 @@ def edit_profile(user_id):
     user = User.query.get_or_404(user_id)
     if not (user == current_user or current_user.is_administrator()):
         abort(403)
+    # region forms
     edit_profile_settings_form = EditProfileSettingsForm(
         current_user,
         data=current_user.to_json_serializeable(),
@@ -87,12 +90,24 @@ def edit_profile(user_id):
         data=current_user.to_json_serializeable(),
         prefix='edit-public-profile-information-form'
     )
+    change_password_form = ChangePasswordForm(
+        current_user,
+        prefix='change-password-form'
+    )
+    edit_notification_settings_form = EditNotificationSettingsForm(
+        data=current_user.to_json_serializeable(),
+        prefix='edit-notification-settings-form'
+    )
+    # endregion forms
+    # region handle edit profile settings form
     if edit_profile_settings_form.validate_on_submit():
         current_user.email = edit_profile_settings_form.email.data
         current_user.username = edit_profile_settings_form.username.data
         db.session.commit()
         flash('Profile settings updated')
         return redirect(url_for('.user', user_id=user.id))
+    # endregion handle edit profile settings form
+    # region handle edit privacy settings form
     if edit_privacy_settings_form.submit.data and edit_privacy_settings_form.validate():
         current_user.is_public = edit_privacy_settings_form.is_public.data
         if edit_privacy_settings_form.show_email.data:
@@ -110,7 +125,9 @@ def edit_profile(user_id):
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.user', user_id=user.id))
-    if edit_public_profile_information_form.validate_on_submit():
+    # endregion handle edit privacy settings form
+    # region handle edit public profile information form
+    if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate():
         if edit_public_profile_information_form.avatar.data:
             try:
                 Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user)
@@ -124,11 +141,28 @@ def edit_profile(user_id):
         db.session.commit()
         flash('Profile settings updated')
         return redirect(url_for('.user', user_id=user.id))
+    # endregion handle edit public profile information form
+    # region handle change_password_form POST
+    if change_password_form.submit.data and change_password_form.validate():
+        current_user.password = change_password_form.new_password.data
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.edit_profile', user_id=user.id))
+    # endregion handle change_password_form POST
+    # region handle edit_notification_settings_form POST
+    if edit_notification_settings_form.submit and edit_notification_settings_form.validate():
+        current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.edit_profile', user_id=user.id))
+    # endregion handle edit_notification_settings_form POST
     return render_template(
         'users/edit_profile.html.j2',
         edit_profile_settings_form=edit_profile_settings_form,
         edit_privacy_settings_form=edit_privacy_settings_form,
         edit_public_profile_information_form=edit_public_profile_information_form,
+        change_password_form=change_password_form,
+        edit_notification_settings_form=edit_notification_settings_form,
         user=user,
         title='Edit Profile'
     )