All tests passing and merged with master.

app/main/views/sign_in.py

@@ -6,6 +6,8 @@ from flask import (
     abort
 )
 
+from flask.ext.login import current_user
+
 from app.main import main
 from app.main.dao import users_dao
 from app.main.forms import LoginForm
@@ -13,18 +15,31 @@ from app.main.forms import LoginForm
 
 @main.route('/sign-in', methods=(['GET', 'POST']))
 def sign_in():
+    if current_user and current_user.is_authenticated():
+        return redirect(url_for('main.choose_service'))
     form = LoginForm()
     if form.validate_on_submit():
-        user = users_dao.get_user_by_email(form.email_address.data)
+        user = _get_and_verify_user(form.email_address.data, form.password.data)
         if user:
-            if not user.is_locked() and user.is_active() and users_dao.verify_password(user, form.password.data):
-                users_dao.send_verify_code(user.id, 'sms')
-                session['user_details'] = {"email": user.email_address, "id": user.id}
-                return redirect(url_for('.two_factor'))
-            else:
-                # TODO re wire this increment to api
-                users_dao.increment_failed_login_count(user.id)
-        # Vague error message for login
-        form.password.errors.append('Username or password is incorrect')
+            users_dao.send_verify_code(user.id, 'sms')
+            session['user_details'] = {"email": user.email_address, "id": user.id}
+            return redirect(url_for('.two_factor'))
+        else:
+            # Vague error message for login in case of user not known, locked, inactive or password not verified
+            form.password.errors.append('Username or password is incorrect')
 
     return render_template('views/signin.html', form=form)
+
+
+def _get_and_verify_user(email_address, password):
+    user = users_dao.get_user_by_email(email_address)
+    if not user:
+        return None
+    elif user.is_locked():
+        return None
+    elif not user.is_active():
+        return None
+    elif not users_dao.verify_password(user, password):
+        return None
+    else:
+        return user