Added check for password on service change page, work in progress.

app/main/views/service_settings.py

@@ -1,10 +1,11 @@
 from flask import (
     render_template, redirect, request, url_for, abort, session)
-from flask_login import login_required
+from flask_login import (login_required, current_user)
 
 from app.main import main
 from app.main.dao.services_dao import (
     get_service_by_id, delete_service, update_service)
+from app.main.dao.users_dao import verify_password
 from app.main.forms import ConfirmPasswordForm, ServiceNameForm
 from client.errors import HTTPError
 
@@ -61,7 +62,10 @@ def service_name_change_confirm(service_id):
         else:
             raise e
 
-    form = ConfirmPasswordForm()
+    # Validate password for form
+    def _check_password(pwd):
+        return verify_password(current_user, pwd)
+    form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
         service['name'] = session['service_name_change']
@@ -128,9 +132,10 @@ def service_status_change_confirm(service_id):
         else:
             raise e
 
-    # TODO validate password, will leave until
-    # user management has been moved to the api.
-    form = ConfirmPasswordForm()
+    # Validate password for form
+    def _check_password(pwd):
+        return verify_password(current_user, pwd)
+    form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
         service['active'] = True
@@ -175,9 +180,11 @@ def service_delete_confirm(service_id):
             abort(404)
         else:
             raise e
-    # TODO validate password, will leave until
-    # user management has been moved to the api.
-    form = ConfirmPasswordForm()
+
+    # Validate password for form
+    def _check_password(pwd):
+        return verify_password(current_user, pwd)
+    form = ConfirmPasswordForm(_check_password)
 
     if form.validate_on_submit():
         try:

app/main/views/user_profile.py

@@ -1,6 +1,7 @@
 from flask import request, render_template, redirect, url_for
 from flask.ext.login import current_user
 from app.main import main
+from app.main.dao.users_dao import (verify_password, update_user)
 from app.main.forms import (
     ChangePasswordForm, ChangeNameForm, ChangeEmailForm, ConfirmEmailForm,
     ChangeMobileNumberForm, ConfirmMobileNumberForm, ConfirmPasswordForm
@@ -15,125 +16,130 @@ def user_profile():
 @main.route("/user-profile/name", methods=['GET', 'POST'])
 def user_profile_name():
 
-    form = ChangeNameForm()
+    form = ChangeNameForm(new_name=current_user.name)
 
-    if request.method == 'GET':
-        if current_user.is_authenticated():
-            form.new_name.data = current_user.name
-        return render_template(
-            'views/user-profile/change.html',
-            thing='name',
-            form_field=form.new_name
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
+        current_user.name = form.new_name
+        update_user(current_user)
         return redirect(url_for('.user_profile'))
 
+    return render_template(
+        'views/user-profile/change.html',
+        thing='name',
+        form_field=form.new_name
+    )
+
 
 @main.route("/user-profile/email", methods=['GET', 'POST'])
 def user_profile_email():
 
-    form = ChangeEmailForm()
+    form = ChangeEmailForm(email_address=current_user.email_address)
 
-    if request.method == 'GET':
-        if current_user.is_authenticated():
-            form.email_address.data = current_user.email_address
-        return render_template(
-            'views/user-profile/change.html',
-            thing='email address',
-            form_field=form.email_address
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
+        # TODO update session with password confirm
         return redirect(url_for('.user_profile_email_authenticate'))
 
+    return render_template(
+        'views/user-profile/change.html',
+        thing='email address',
+        form_field=form.email_address
+    )
+
 
 @main.route("/user-profile/email/authenticate", methods=['GET', 'POST'])
 def user_profile_email_authenticate():
 
-    form = ConfirmPasswordForm()
+    # Validate password for form
+    def _check_password(pwd):
+        return verify_password(current_user, pwd)
+    form = ConfirmPasswordForm(_check_password)
 
-    if request.method == 'GET':
-        return render_template(
-            'views/user-profile/authenticate.html',
-            thing='email address',
-            form=form,
-            back_link=url_for('.user_profile_email')
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
         return redirect(url_for('.user_profile_email_confirm'))
 
+    return render_template(
+        'views/user-profile/authenticate.html',
+        thing='email address',
+        form=form,
+        back_link=url_for('.user_profile_email')
+    )
+
 
 @main.route("/user-profile/email/confirm", methods=['GET', 'POST'])
 def user_profile_email_confirm():
 
     form = ConfirmEmailForm()
 
-    if request.method == 'GET':
-        return render_template(
-            'views/user-profile/confirm.html',
-            form_field=form.email_code,
-            thing='email address'
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
         return redirect(url_for('.user_profile'))
 
+    return render_template(
+        'views/user-profile/confirm.html',
+        form_field=form.email_code,
+        thing='email address'
+    )
+
 
 @main.route("/user-profile/mobile-number", methods=['GET', 'POST'])
 def user_profile_mobile_number():
 
-    form = ChangeMobileNumberForm()
+    form = ChangeMobileNumberForm(mobile_number=current_user.mobile_number)
 
-    if request.method == 'GET':
-        if current_user.is_authenticated():
-            form.mobile_number.data = current_user.mobile_number
-        return render_template(
-            'views/user-profile/change.html',
-            thing='mobile number',
-            form_field=form.mobile_number
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
+        # update session with this step
         return redirect(url_for('.user_profile_mobile_number_authenticate'))
 
+    return render_template(
+        'views/user-profile/change.html',
+        thing='mobile number',
+        form_field=form.mobile_number
+    )
+
 
 @main.route("/user-profile/mobile-number/authenticate", methods=['GET', 'POST'])
 def user_profile_mobile_number_authenticate():
 
-    form = ConfirmPasswordForm()
+    # Validate password for form
+    def _check_password(pwd):
+        return verify_password(current_user, pwd)
+    form = ConfirmPasswordForm(_check_password)
 
-    if request.method == 'GET':
-        return render_template(
-            'views/user-profile/authenticate.html',
-            thing='mobile number',
-            form=form,
-            back_link=url_for('.user_profile_mobile_number_confirm')
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
+        # Update mobile number
         return redirect(url_for('.user_profile_mobile_number_confirm'))
 
+    return render_template(
+        'views/user-profile/authenticate.html',
+        thing='mobile number',
+        form=form,
+        back_link=url_for('.user_profile_mobile_number_confirm')
+    )
+
 
 @main.route("/user-profile/mobile-number/confirm", methods=['GET', 'POST'])
 def user_profile_mobile_number_confirm():
 
     form = ConfirmMobileNumberForm()
 
-    if request.method == 'GET':
-        return render_template(
-            'views/user-profile/confirm.html',
-            form_field=form.sms_code,
-            thing='mobile number'
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
         return redirect(url_for('.user_profile'))
 
+    return render_template(
+        'views/user-profile/confirm.html',
+        form_field=form.sms_code,
+        thing='mobile number'
+    )
+
 
 @main.route("/user-profile/password", methods=['GET', 'POST'])
 def user_profile_password():
 
     form = ChangePasswordForm()
 
-    if request.method == 'GET':
-        return render_template(
-            'views/user-profile/change-password.html',
-            form=form
-        )
-    elif request.method == 'POST':
+    if form.validate_on_submit():
         return redirect(url_for('.user_profile'))
+
+    return render_template(
+        'views/user-profile/change-password.html',
+        form=form
+    )