Refactor for code_not_received, sign_in, two_factor and verify.

app/main/forms.py

@@ -92,9 +92,9 @@ class EmailNotReceivedForm(Form):
 
 
 class TextNotReceivedForm(Form):
-    mobile_number = StringField('Mobile phone number',
-                                validators=[DataRequired(message='Please enter your mobile number'),
-                                            Regexp(regex=mobile_number, message='Please enter a +44 mobile number')])
+    mobile_number = StringField('Mobile phone number', validators=[
+        DataRequired(message='Please enter your mobile number'),
+        Regexp(regex=mobile_number, message='Please enter a +44 mobile number')])
 
 
 class AddServiceForm(Form):
@@ -102,7 +102,8 @@ class AddServiceForm(Form):
         self.service_names = service_names
         super(AddServiceForm, self).__init__(*args, **kwargs)
 
-    service_name = StringField(validators=[DataRequired(message='Please enter your service name')])
+    service_name = StringField(validators=[
+        DataRequired(message='Please enter your service name')])
 
     def validate_service_name(self, a):
         if self.service_name.data in self.service_names:

app/main/views/code_not_received.py

@@ -1,4 +1,5 @@
-from flask import render_template, redirect, jsonify, session
+from flask import (
+    render_template, redirect, jsonify, session, url_for)
 
 from app.main import main
 from app.main.dao import users_dao
@@ -6,39 +7,28 @@ from app.main.forms import EmailNotReceivedForm, TextNotReceivedForm
 from app.main.views import send_sms_code, send_email_code
 
 
-@main.route("/email-not-received", methods=['GET'])
-def email_not_received():
-    user = users_dao.get_user_by_id(session['user_id'])
-    return render_template('views/email-not-received.html',
-                           form=EmailNotReceivedForm(email_address=user.email_address))
-
-
-@main.route('/email-not-received', methods=['POST'])
+@main.route('/email-not-received', methods=['GET', 'POST'])
 def check_and_resend_email_code():
-    form = EmailNotReceivedForm()
+    # TODO there needs to be a way to regenerate a session id
+    user = users_dao.get_user_by_id(session['user_id'])
+    form = EmailNotReceivedForm(email_address=user.email_address)
     if form.validate_on_submit():
-        user = users_dao.get_user_by_id(session['user_id'])
         users_dao.update_email_address(id=user.id, email_address=form.email_address.data)
         send_email_code(user_id=user.id, email=user.email_address)
-        return redirect('/verify')
-    return jsonify(form.errors), 400
+        return redirect(url_for('.verify'))
+    return render_template('views/email-not-received.html', form=form)
 
 
-@main.route("/text-not-received", methods=['GET'])
-def text_not_received():
-    user = users_dao.get_user_by_id(session['user_id'])
-    return render_template('views/text-not-received.html', form=TextNotReceivedForm(mobile_number=user.mobile_number))
-
-
-@main.route('/text-not-received', methods=['POST'])
+@main.route('/text-not-received', methods=['GET', 'POST'])
 def check_and_resend_text_code():
-    form = TextNotReceivedForm()
+    # TODO there needs to be a way to regenerate a session id
+    user = users_dao.get_user_by_id(session['user_id'])
+    form = TextNotReceivedForm(mobile_number=user.mobile_number)
     if form.validate_on_submit():
-        user = users_dao.get_user_by_id(session['user_id'])
         users_dao.update_mobile_number(id=user.id, mobile_number=form.mobile_number.data)
         send_sms_code(user_id=user.id, mobile_number=user.mobile_number)
-        return redirect('/verify')
-    return jsonify(form.errors), 400
+        return redirect(url_for('.verify'))
+    return render_template('views/text-not-received.html', form=form)
 
 
 @main.route('/verification-not-received', methods=['GET'])
@@ -48,6 +38,7 @@ def verification_code_not_received():
 
 @main.route('/send-new-code', methods=['GET'])
 def check_and_resend_verification_code():
+    # TODO there needs to be a way to generate a new session id
     user = users_dao.get_user_by_id(session['user_id'])
     send_sms_code(user.id, user.mobile_number)
-    return redirect('/two-factor')
+    return redirect(url_for('main.two_factor'))

app/main/views/sign_in.py

@@ -1,4 +1,5 @@
-from flask import render_template, redirect, jsonify
+from flask import (
+    render_template, redirect, jsonify, url_for)
 from flask import session
 
 from app.main import main
@@ -10,18 +11,21 @@ from app.main.views import send_sms_code
 
 @main.route('/sign-in', methods=(['GET', 'POST']))
 def sign_in():
-    form = LoginForm()
-    if form.validate_on_submit():
-        user = users_dao.get_user_by_email(form.email_address.data)
+    try:
+        form = LoginForm()
+        if form.validate_on_submit():
+            user = users_dao.get_user_by_email(form.email_address.data)
+            if user:
+                if not user.is_locked() and user.is_active() and check_hash(form.password.data, user.password):
+                    send_sms_code(user.id, user.mobile_number)
+                    session['user_id'] = user.id
+                    return redirect(url_for('.two_factor'))
+                else:
+                    users_dao.increment_failed_login_count(user.id)
+            # Vague error message for login
+            form.password.errors.append('Username or password is incorrect')
 
-        if user:
-            if not user.is_locked() and user.is_active() and check_hash(form.password.data, user.password):
-                send_sms_code(user.id, user.mobile_number)
-                session['user_id'] = user.id
-                return redirect('/two-factor')
-            else:
-                users_dao.increment_failed_login_count(user.id)
-        # Vague error message for login
-        form.password.errors.append('Username or password is incorrect')
-
-    return render_template('views/signin.html', form=form)
+        return render_template('views/signin.html', form=form)
+    except:
+        import traceback
+        traceback.print_exc()

app/main/views/two_factor.py

@@ -1,4 +1,5 @@
-from flask import render_template, redirect, jsonify, session
+from flask import (
+    render_template, redirect, jsonify, session, url_for)
 from flask_login import login_user
 
 from app.main import main
@@ -6,19 +7,14 @@ from app.main.dao import users_dao, verify_codes_dao
 from app.main.forms import TwoFactorForm
 
 
-@main.route("/two-factor", methods=['GET'])
-def render_two_factor():
-    return render_template('views/two-factor.html', form=TwoFactorForm())
-
-
-@main.route('/two-factor', methods=['POST'])
-def process_two_factor():
+@main.route('/two-factor', methods=['GET', 'POST'])
+def two_factor():
     form = TwoFactorForm()
 
     if form.validate_on_submit():
         user = users_dao.get_user_by_id(session['user_id'])
         verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
         login_user(user)
-        return redirect('/dashboard')
-    else:
-        return jsonify(form.errors), 400
+        return redirect(url_for('.dashboard'))
+
+    return render_template('views/two-factor.html', form=form)

app/main/views/verify.py

@@ -1,4 +1,5 @@
-from flask import render_template, redirect, jsonify, session
+from flask import (
+    render_template, redirect, jsonify, session, url_for)
 from flask_login import login_user
 
 from app.main import main
@@ -6,20 +7,19 @@ from app.main.dao import users_dao, verify_codes_dao
 from app.main.forms import VerifyForm
 
 
-@main.route('/verify', methods=['GET'])
-def render_verify():
-    return render_template('views/verify.html', form=VerifyForm())
-
-
-@main.route('/verify', methods=['POST'])
-def process_verify():
-    form = VerifyForm()
-    if form.validate_on_submit():
+@main.route('/verify', methods=['GET', 'POST'])
+def verify():
+    # TODO there needs to be a way to regenerate a session id
+    try:
         user = users_dao.get_user_by_id(session['user_id'])
-        verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='email')
-        verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
-        users_dao.activate_user(user.id)
-        login_user(user)
-        return redirect('/add-service')
-    else:
-        return jsonify(form.errors), 400
+        form = VerifyForm()
+        if form.validate_on_submit():
+            verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='email')
+            verify_codes_dao.use_code_for_user_and_type(user_id=user.id, code_type='sms')
+            users_dao.activate_user(user.id)
+            login_user(user)
+            return redirect(url_for('.add_service'))
+        return render_template('views/verify.html', form=form)
+    except:
+        import traceback
+        traceback.print_exc()