darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 14:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

send people to /two-factor-sms instead of /two-factor

Browse Source 
both routes are already valid, however, the link from sign-in sends to
the old link. it fetches whichever URL is second in the route decorator
list when you call `url_for`. Swapping the order around keeps the routes
valid but starts pointing users to the new url.
This commit is contained in:
Leo Hemsted
2021-06-03 12:43:53 +01:00
parent bb7343d846
commit 26ad20719f
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,8 +60,8 @@ def two_factor_email(token):
return log_in_user(user_id) return log_in_user(user_id)
@main.route('/two-factor-sms', methods=['GET', 'POST'])
@main.route('/two-factor', methods=['GET', 'POST']) @main.route('/two-factor', methods=['GET', 'POST'])
@main.route('/two-factor-sms', methods=['GET', 'POST'])
@redirect_to_sign_in @redirect_to_sign_in
def two_factor_sms(): def two_factor_sms():
user_id = session['user_details']['id'] user_id = session['user_details']['id']

2
tests/app/main/views/test_sign_in.py
View File

@@ -130,8 +130,6 @@ def test_process_sms_auth_sign_in_return_2fa_template(
'email_address': email_address, 'email_address': email_address,
'password': password}) 'password': password})
assert response.status_code == 302 assert response.status_code == 302
# TODO: remove this assert once we start defaulting to returning two_factor_sms first
assert '/two-factor-sms' not in response.location
assert response.location == url_for('.two_factor_sms', next=redirect_url, _external=True) assert response.location == url_for('.two_factor_sms', next=redirect_url, _external=True)
mock_verify_password.assert_called_with(api_user_active['id'], password) mock_verify_password.assert_called_with(api_user_active['id'], password)
mock_get_user_by_email.assert_called_with('valid@example.gov.uk') mock_get_user_by_email.assert_called_with('valid@example.gov.uk')