mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-05 10:53:28 -05:00
110880218: Implementation to resend the verification code.
Added implementation for GET/POST for the /verification-not-received endpoint.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
from flask import render_template, redirect, jsonify, session
|
from flask import render_template, redirect, jsonify, session
|
||||||
|
|
||||||
from app.main import main
|
from app.main import main
|
||||||
from app.main.dao import users_dao, verify_codes_dao
|
from app.main.dao import users_dao
|
||||||
from app.main.forms import EmailNotReceivedForm, TextNotReceivedForm
|
from app.main.forms import EmailNotReceivedForm, TextNotReceivedForm
|
||||||
from app.main.views import send_sms_code, send_email_code
|
from app.main.views import send_sms_code, send_email_code
|
||||||
|
|
||||||
@@ -39,3 +39,15 @@ def check_and_resend_text_code():
|
|||||||
send_sms_code(user_id=user.id, mobile_number=user.mobile_number)
|
send_sms_code(user_id=user.id, mobile_number=user.mobile_number)
|
||||||
return redirect('/verify')
|
return redirect('/verify')
|
||||||
return jsonify(form.errors), 400
|
return jsonify(form.errors), 400
|
||||||
|
|
||||||
|
|
||||||
|
@main.route('/verification-not-received', methods=['GET'])
|
||||||
|
def verification_code_not_received():
|
||||||
|
return render_template('views/verification-not-received.html')
|
||||||
|
|
||||||
|
|
||||||
|
@main.route('/verification-not-received', methods=['POST'])
|
||||||
|
def check_and_resend_verification_code():
|
||||||
|
user = users_dao.get_user_by_id(session['user_id'])
|
||||||
|
send_sms_code(user.id, user.mobile_number)
|
||||||
|
return redirect('/two-factor')
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ def test_should_render_text_code_not_received_template(notifications_admin,
|
|||||||
_set_up_mocker(mocker)
|
_set_up_mocker(mocker)
|
||||||
user = create_test_user('pending')
|
user = create_test_user('pending')
|
||||||
session['user_id'] = user.id
|
session['user_id'] = user.id
|
||||||
verify_codes_dao.add_code(user.id, code='12345', code_type='email')
|
verify_codes_dao.add_code(user.id, code='12345', code_type='sms')
|
||||||
response = client.get('/text-not-received')
|
response = client.get('/text-not-received')
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert 'Check your mobile phone number is correct and then resend the confirmation code.' \
|
assert 'Check your mobile phone number is correct and then resend the confirmation code.' \
|
||||||
@@ -70,17 +70,17 @@ def test_should_update_email_address_resend_code(notifications_admin,
|
|||||||
notify_db_session,
|
notify_db_session,
|
||||||
mocker):
|
mocker):
|
||||||
with notifications_admin.test_client() as client:
|
with notifications_admin.test_client() as client:
|
||||||
with client.session_transaction() as session:
|
with client.session_transaction() as session:
|
||||||
_set_up_mocker(mocker)
|
_set_up_mocker(mocker)
|
||||||
user = create_test_user('pending')
|
user = create_test_user('pending')
|
||||||
session['user_id'] = user.id
|
session['user_id'] = user.id
|
||||||
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='email')
|
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='email')
|
||||||
response = client.post('/email-not-received',
|
response = client.post('/email-not-received',
|
||||||
data={'email_address': 'new@address.gov.uk'})
|
data={'email_address': 'new@address.gov.uk'})
|
||||||
assert response.status_code == 302
|
assert response.status_code == 302
|
||||||
assert response.location == 'http://localhost/verify'
|
assert response.location == 'http://localhost/verify'
|
||||||
updated_user = users_dao.get_user_by_id(user.id)
|
updated_user = users_dao.get_user_by_id(user.id)
|
||||||
assert updated_user.email_address == 'new@address.gov.uk'
|
assert updated_user.email_address == 'new@address.gov.uk'
|
||||||
|
|
||||||
|
|
||||||
def test_should_update_mobile_number_resend_code(notifications_admin,
|
def test_should_update_mobile_number_resend_code(notifications_admin,
|
||||||
@@ -88,17 +88,45 @@ def test_should_update_mobile_number_resend_code(notifications_admin,
|
|||||||
notify_db_session,
|
notify_db_session,
|
||||||
mocker):
|
mocker):
|
||||||
with notifications_admin.test_client() as client:
|
with notifications_admin.test_client() as client:
|
||||||
with client.session_transaction() as session:
|
with client.session_transaction() as session:
|
||||||
_set_up_mocker(mocker)
|
_set_up_mocker(mocker)
|
||||||
user = create_test_user('pending')
|
user = create_test_user('pending')
|
||||||
session['user_id'] = user.id
|
session['user_id'] = user.id
|
||||||
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
|
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
|
||||||
response = client.post('/text-not-received',
|
response = client.post('/text-not-received',
|
||||||
data={'mobile_number': '+443456789012'})
|
data={'mobile_number': '+443456789012'})
|
||||||
assert response.status_code == 302
|
assert response.status_code == 302
|
||||||
assert response.location == 'http://localhost/verify'
|
assert response.location == 'http://localhost/verify'
|
||||||
updated_user = users_dao.get_user_by_id(user.id)
|
updated_user = users_dao.get_user_by_id(user.id)
|
||||||
assert updated_user.mobile_number == '+443456789012'
|
assert updated_user.mobile_number == '+443456789012'
|
||||||
|
|
||||||
|
|
||||||
|
def test_should_render_verification_code_not_received(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
|
||||||
|
response = client.get('/verification-not-received')
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert 'Resend verification code' in response.get_data(as_text=True)
|
||||||
|
assert 'If you no longer have access to the phone with the number you registered for this service, ' \
|
||||||
|
'speak to your service manager to reset the number.' in response.get_data(as_text=True)
|
||||||
|
|
||||||
|
|
||||||
|
def test_check_and_redirect_to_two_factor(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
|
||||||
|
_set_up_mocker(mocker)
|
||||||
|
response = client.post('/verification-not-received')
|
||||||
|
assert response.status_code == 302
|
||||||
|
assert response.location == 'http://localhost/two-factor'
|
||||||
|
|
||||||
|
|
||||||
def _set_up_mocker(mocker):
|
def _set_up_mocker(mocker):
|
||||||
|
|||||||
Reference in New Issue
Block a user