Refactor for code_not_received, sign_in, two_factor and verify.

This commit is contained in:
Nicholas Staples
2016-01-05 17:08:50 +00:00
parent 1f520116f0
commit 0ebacd6929
16 changed files with 336 additions and 321 deletions
+19 -15
View File
@@ -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()