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

Merge pull request #3432 from alphagov/add-use-endpoint

Browse Source 
Add a second URL for the email auth endpoint
This commit is contained in:
Chris Hill-Scott
2020-05-04 15:45:51 +01:00
committed by GitHub
parent 0f3e0409db ae2f8f9887
commit fe6dad2752
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ def two_factor_email_sent():
) )
@main.route('/email-auth/<token>', methods=['GET']) @main.route('/email-auth/<token>', methods=['GET', 'POST'])
def two_factor_email(token): def two_factor_email(token):
if current_user.is_authenticated: if current_user.is_authenticated:
return redirect_when_logged_in(platform_admin=current_user.platform_admin) return redirect_when_logged_in(platform_admin=current_user.platform_admin)

6
tests/app/main/views/test_two_factor.py
View File

@@ -253,6 +253,9 @@ def test_two_factor_should_activate_pending_user(
assert mock_activate_user.called assert mock_activate_user.called
@pytest.mark.parametrize('http_method', (
'get', 'post',
))
def test_valid_two_factor_email_link_logs_in_user( def test_valid_two_factor_email_link_logs_in_user(
client, client,
valid_token, valid_token,
@@ -260,10 +263,11 @@ def test_valid_two_factor_email_link_logs_in_user(
mock_get_services_with_one_service, mock_get_services_with_one_service,
mocker, mocker,
mock_create_event, mock_create_event,
http_method,
): ):
mocker.patch('app.user_api_client.check_verify_code', return_value=(True, '')) mocker.patch('app.user_api_client.check_verify_code', return_value=(True, ''))
response = client.get( response = getattr(client, http_method)(
url_for_endpoint_with_token('main.two_factor_email', token=valid_token), url_for_endpoint_with_token('main.two_factor_email', token=valid_token),
) )