darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-26 02:49:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Turn on redirects for check_and_resend_verification_code

Browse Source 
This is part of the work to make sure user is redirected
to the page they initially were meant to visit after
they sign in.
This commit is contained in:
Pea Tyczynska
2020-10-09 11:39:44 +01:00
parent c3b7481e11
commit 1dd8b08042
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,10 +39,11 @@ def check_and_resend_text_code():
def check_and_resend_verification_code():
user = User.from_email_address(session['user_details']['email'])
user.send_verify_code()
redirect_url = request.args.get('next')
if user.state == 'pending':
return redirect(url_for('main.verify'))
return redirect(url_for('main.verify', next=redirect_url))
else:
return redirect(url_for('main.two_factor'))
return redirect(url_for('main.two_factor', next=redirect_url))
@main.route('/email-not-received', methods=['GET'])

18
tests/app/main/views/test_code_not_received.py
View File

@@ -119,27 +119,37 @@ def test_should_resend_verify_code_and_update_mobile_for_pending_user(
)
@pytest.mark.parametrize('redirect_url', [
None,
'blob',
])
def test_check_and_redirect_to_two_factor_if_user_active(
client,
api_user_active,
mock_get_user_by_email,
mock_send_verify_code,
redirect_url
):
with client.session_transaction() as session:
session['user_details'] = {
'id': api_user_active['id'],
'email': api_user_active['email_address']}
response = client.get(url_for('main.check_and_resend_verification_code'))
response = client.get(url_for('main.check_and_resend_verification_code', next=redirect_url))
assert response.status_code == 302
assert response.location == url_for('main.two_factor', _external=True)
assert response.location == url_for('main.two_factor', _external=True, next=redirect_url)
@pytest.mark.parametrize('redirect_url', [
None,
'blob',
])
def test_check_and_redirect_to_verify_if_user_pending(
client,
mocker,
api_user_pending,
mock_get_user_pending,
mock_send_verify_code,
redirect_url
):
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
@@ -148,9 +158,9 @@ def test_check_and_redirect_to_verify_if_user_pending(
session['user_details'] = {
'id': api_user_pending['id'],
'email': api_user_pending['email_address']}
response = client.get(url_for('main.check_and_resend_verification_code'))
response = client.get(url_for('main.check_and_resend_verification_code', next=redirect_url))
assert response.status_code == 302
assert response.location == url_for('main.verify', _external=True)
assert response.location == url_for('main.verify', _external=True, next=redirect_url)
@pytest.mark.parametrize('endpoint', [