darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-17 04:59:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor for code_not_received, sign_in, two_factor and verify.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/forms.py
View File

@@ -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:

41
app/main/views/code_not_received.py
View File

@@ -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'))

34
app/main/views/sign_in.py
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()

18
app/main/views/two_factor.py
View File

@@ -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)

34
app/main/views/verify.py
View File

@@ -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()

8
app/templates/views/email-not-received.html
View File

@@ -11,17 +11,13 @@ GOV.UK Notify
<h1 class="heading-xlarge">Check your email address</h1>
<p>Check your email address is correct and then resend the confirmation code.</p>
<p>
</p>
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
<label class="form-label">Email address</label>
{{ form.email_address(class="form-control-2-3", autocomplete="off") }} <br>
<span class="font-xsmall">Your email address must end in .gov.uk</span>
{{ render_field(form.email_address, class='form-control-2-3') }}
<p>
<button class="button" href="verify" role="button">Resend confirmation code</button>
<button class="button" role="button">Resend confirmation code</button>
</p>
</form>
</div>

2
app/templates/views/register.html
View File

@@ -10,7 +10,7 @@ GOV.UK Notify | Create an account
<div class="column-two-thirds">
<h1 class="heading-xlarge">Create an account</h1>
<p>If you've used GOV.UK Notify before, <a href="">sign in to your account</a>.</p>
<p>If you've used GOV.UK Notify before, <a href="{{ url_for('.sign_in') }}">sign in to your account</a>.</p>
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}

2
app/templates/views/signin.html
View File

@@ -20,7 +20,7 @@ Sign in
<span class="font-xsmall"><a href="">Forgotten password?</a></span>
</p>
<p>
<button class="button" href="two-factor" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>

7
app/templates/views/text-not-received.html
View File

@@ -14,12 +14,9 @@ GOV.UK Notify
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.mobile_number, class='form-control-2-3') }}
<p>
<label class="form-label">Mobile phone number</label>
{{ form.mobile_number(class="form-control-1-4", autocomplete="off") }} <br>
</p>
<p>
<button class="button" href="verify" role="button">Resend confirmation code</button>
<button class="button" role="button">Resend confirmation code</button>
</p>
</form>
</div>

9
app/templates/views/two-factor.html
View File

@@ -15,13 +15,10 @@ GOV.UK Notify | Text verification
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.sms_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.verification_code_not_received') }}">I haven't received a text</a></span>
<p>
<label class="form-label">Enter verification code</label><br>
{{ form.sms_code(class="form-control-1-4", autocomplete="off") }} <br>
<span class="font-xsmall"><a href="verification-not-received">I haven't received a text</a></span>
</p>
<p>
<button class="button" href="dashboard" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>

2
app/templates/views/verify-mobile.html
View File

@@ -15,7 +15,7 @@ GOV.UK Notify | Confirm mobile number
<p>
<label class="form-label" for="email">Enter confirmation code<br>
<input class="form-control-1-4" id="email" type="text"><br>
<span class="font-xsmall"><a href="text-not-received-2">I haven't received a text</a></span>
<span class="font-xsmall"><a href="{{ url_for('.text-not-received-2') }}">I haven't received a text</a></span>
</p>
<p>

17
app/templates/views/verify.html
View File

@@ -14,19 +14,12 @@ GOV.UK Notify | Confirm email address and mobile number
<form autocomplete="off" action="" method="post">
{{ form.hidden_tag() }}
{{ render_field(form.email_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_email_code')}}">I haven't received an email</a></span>
{{ render_field(form.sms_code, class='form-control-1-4') }}
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_text_code') }}">I haven't received a text</a></span>
<p>
<label class="form-label">Email confirmation code</label>
{{ form.email_code(class="form-control-1-4", autocomplete="off") }}<br>
<span class="font-xsmall"><a href="email-not-received">I haven't received an email</a></span>
</p>
<p>
<label class="form-label">Text message confirmation code</label>
{{ form.sms_code(class="form-control-1-4", autocomplete="off") }} <br>
<span class="font-xsmall"><a href="text-not-received">I haven't received a text</a></span>
</p>
<p>
<button class="button" href="add-service" role="button">Continue</button>
<button class="button" role="button">Continue</button>
</p>
</form>
</div>