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

redirect to show_accounts_or_dashboard on login

Browse Source 
show_accounts_or_dashboard has logic about where you should redirect
to. If we let it do this, then that's nicer than duplicating its
logic. We found that it wasn't accounting for orgs in redirects
properly.
This commit is contained in:
Leo Hemsted
2018-03-19 16:38:57 +00:00
parent 90c40075c8
commit e000552e56
3 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,3 @@
from unittest.mock import ANY
from bs4 import BeautifulSoup
from flask import url_for
from tests.conftest import SERVICE_ONE_ID, normalize_spaces, set_config
@@ -21,38 +19,12 @@ def test_should_render_two_factor_page(
assert '''We’ve sent you a text message with a security code.''' in response.get_data(as_text=True)
def test_should_login_user_and_redirect_to_service_dashboard(
client,
api_user_active,
mock_get_user,
mock_get_user_by_email,
mock_check_verify_code,
mock_get_services_with_one_service,
mock_events,
):
with client.session_transaction() as session:
session['user_details'] = {
'id': api_user_active.id,
'email': api_user_active.email_address}
response = client.post(url_for('main.two_factor'),
data={'sms_code': '12345'})
assert response.status_code == 302
assert response.location == url_for(
'main.service_dashboard',
service_id=SERVICE_ONE_ID,
_external=True
)
mock_events.assert_called_with('sucessful_login', ANY)
def test_should_login_user_and_should_redirect_to_next_url(
client,
api_user_active,
mock_get_user,
mock_get_user_by_email,
mock_check_verify_code,
mock_get_services,
):
with client.session_transaction() as session:
session['user_details'] = {
@@ -83,20 +55,15 @@ def test_should_login_user_and_not_redirect_to_external_url(
response = client.post(url_for('main.two_factor', next='http://www.google.com'),
data={'sms_code': '12345'})
assert response.status_code == 302
assert response.location == url_for(
'main.service_dashboard',
service_id=SERVICE_ONE_ID,
_external=True
)
assert response.location == url_for('main.show_accounts_or_dashboard', _external=True)
def test_should_login_user_and_redirect_to_choose_accounts(
def test_should_login_user_and_redirect_to_show_accounts(
client,
api_user_active,
mock_get_user,
mock_get_user_by_email,
mock_check_verify_code,
mock_get_services,
):
with client.session_transaction() as session:
session['user_details'] = {
@@ -106,7 +73,7 @@ def test_should_login_user_and_redirect_to_choose_accounts(
data={'sms_code': '12345'})
assert response.status_code == 302
assert response.location == url_for('main.choose_account', _external=True)
assert response.location == url_for('main.show_accounts_or_dashboard', _external=True)
def test_should_return_200_with_sms_code_error_when_sms_code_is_wrong(
@@ -159,11 +126,8 @@ def test_two_factor_should_set_password_when_new_password_exists_in_session(
response = client.post(url_for('main.two_factor'),
data={'sms_code': '12345'})
assert response.status_code == 302
assert response.location == url_for(
'main.service_dashboard',
service_id=SERVICE_ONE_ID,
_external=True
)
assert response.location == url_for('main.show_accounts_or_dashboard', _external=True)
mock_update_user_password.assert_called_once_with(api_user_active.id, password='changedpassword')
@@ -230,7 +194,7 @@ def test_valid_two_factor_email_link_logs_in_user(
)
assert response.status_code == 302
assert response.location == url_for('main.service_dashboard', service_id=SERVICE_ONE_ID, _external=True)
assert response.location == url_for('main.show_accounts_or_dashboard', _external=True)
def test_two_factor_email_link_has_expired(
@@ -321,4 +285,4 @@ def test_two_factor_email_link_used_when_user_already_logged_in(
url_for('main.two_factor_email', token=valid_token)
)
assert response.status_code == 302
assert response.location == url_for('main.choose_account', _external=True)
assert response.location == url_for('main.show_accounts_or_dashboard', _external=True)