110880218: Completed implementation of resend the verificaton code

This commit is contained in:
Rebecca Law
2015-12-31 13:16:59 +00:00
parent fb5e80e0d4
commit b2f544a165
4 changed files with 42 additions and 3 deletions

View File

@@ -46,7 +46,7 @@ def verification_code_not_received():
return render_template('views/verification-not-received.html')
@main.route('/verification-not-received', methods=['POST'])
@main.route('/send-new-code', methods=['GET'])
def check_and_resend_verification_code():
user = users_dao.get_user_by_id(session['user_id'])
send_sms_code(user.id, user.mobile_number)

View File

@@ -16,7 +16,7 @@ GOV.UK Notify
<p>
<a class="button" href="two-factor" role="button">Resend verification code</a>
<a class="button" href="send-new-code" role="button">Resend verification code</a>
</p>
</div>
</div>

View File

@@ -124,11 +124,30 @@ def test_check_and_redirect_to_two_factor(notifications_admin,
user = create_test_user('active')
session['user_id'] = user.id
_set_up_mocker(mocker)
response = client.post('/verification-not-received')
response = client.get('/send-new-code')
assert response.status_code == 302
assert response.location == 'http://localhost/two-factor'
def test_should_create_new_code_for_user(notifications_admin,
notifications_admin_db,
notify_db_session,
mocker):
with notifications_admin.test_client() as client:
with client.session_transaction() as session:
user = create_test_user('active')
session['user_id'] = user.id
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
_set_up_mocker(mocker)
response = client.get('/send-new-code')
assert response.status_code == 302
assert response.location == 'http://localhost/two-factor'
codes = verify_codes_dao.get_codes(user_id=user.id, code_type='sms')
assert len(codes) == 2
for x in ([used.code_used for used in codes]):
assert x is False
def _set_up_mocker(mocker):
mocker.patch("app.admin_api_client.send_sms")
mocker.patch("app.admin_api_client.send_email")

View File

@@ -35,3 +35,23 @@ def test_should_return_400_with_sms_code_error_when_sms_code_is_wrong(notificati
data={'sms_code': '23456'})
assert response.status_code == 400
assert {'sms_code': ['Code does not match']} == json.loads(response.get_data(as_text=True))
def test_should_login_user_when_multiple_valid_codes_exist(notifications_admin,
notifications_admin_db,
notify_db_session):
with notifications_admin.test_client() as client:
with client.session_transaction() as session:
user = create_test_user('active')
session['user_id'] = user.id
verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='sms')
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
verify_codes_dao.add_code(user_id=user.id, code='34567', code_type='sms')
assert len(verify_codes_dao.get_codes(user_id=user.id, code_type='sms')) == 3
response = client.post('/two-factor',
data={'sms_code': '23456'})
assert response.status_code == 302
print(user.id)
codes = verify_codes_dao.get_codes(user_id=user.id, code_type='sms')
# query will only return codes where code_used == False
assert len(codes) == 0