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

If user is logged in and visits / /sign-in or /register they will

Browse Source 
be redirected to choose service.
This commit is contained in:
Adam Shimali
2016-01-22 17:24:14 +00:00
parent f11f50b4a5
commit f8fc8e951a
6 changed files with 110 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/views/index.py
View File

@@ -1,10 +1,14 @@
from flask import render_template from flask import render_template, url_for, redirect
from app.main import main from app.main import main
from flask_login import login_required from flask_login import login_required
from flask.ext.login import current_user
@main.route('/') @main.route('/')
def index(): def index():
if current_user and current_user.is_authenticated():
return redirect(url_for('main.choose_service'))
return render_template('views/signedout.html') return render_template('views/signedout.html')

8
app/main/views/register.py
View File

@@ -4,9 +4,12 @@ from flask import (
render_template, render_template,
redirect, redirect,
session, session,
abort abort,
url_for
) )
from flask.ext.login import current_user
from client.errors import HTTPError from client.errors import HTTPError
from app.main import main from app.main import main
@@ -22,6 +25,9 @@ from app.notify_client.sender import send_sms_code, send_email_code
@main.route('/register', methods=['GET', 'POST']) @main.route('/register', methods=['GET', 'POST'])
def register(): def register():
if current_user and current_user.is_authenticated():
return redirect(url_for('main.choose_service'))
form = RegisterUserForm(users_dao.get_user_by_email) form = RegisterUserForm(users_dao.get_user_by_email)
if form.validate_on_submit(): if form.validate_on_submit():

8
app/main/views/sign_in.py
View File

@@ -2,11 +2,13 @@ from flask import (
render_template, render_template,
redirect, redirect,
url_for, url_for,
session, session
abort
) )
from flask.ext.login import current_user
from app.main import main from app.main import main
from app.main.dao import users_dao from app.main.dao import users_dao
from app.main.forms import LoginForm from app.main.forms import LoginForm
@@ -15,6 +17,8 @@ from app.notify_client.sender import send_sms_code
@main.route('/sign-in', methods=(['GET', 'POST'])) @main.route('/sign-in', methods=(['GET', 'POST']))
def sign_in(): def sign_in():
if current_user and current_user.is_authenticated():
return redirect(url_for('main.choose_service'))
try: try:
form = LoginForm() form = LoginForm()
if form.validate_on_submit(): if form.validate_on_submit():

17
tests/app/main/views/test_index.py Normal file
View File

@@ -0,0 +1,17 @@
from flask import url_for
def test_logged_in_user_redirects_to_choose_service(app_,
db_,
db_session,
mock_api_user,
mock_user_loader,
mock_user_dao_get_by_email):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
response = client.get(url_for('main.index'))
assert response.status_code == 302
response = client.get(url_for('main.sign_in', follow_redirects=True))
assert response.location == url_for('main.choose_service', _external=True)

24
tests/app/main/views/test_register.py
View File

@@ -1,13 +1,27 @@
from flask import url_for from flask import url_for
from tests.conftest import mock_register_user as mock_user
def test_render_register_returns_template_with_form(app_, db_, db_session):
response = app_.test_client().get('/register')
assert response.status_code == 200
assert 'Create an account' in response.get_data(as_text=True)
# def test_render_register_returns_template_with_form(app_, db_, db_session): def test_logged_in_user_redirects_to_choose_service(app_,
# response = app_.test_client().get('/register') db_,
db_session,
mock_api_user,
mock_user_loader,
mock_user_dao_get_by_email):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
response = client.get(url_for('main.register'))
assert response.status_code == 302
# assert response.status_code == 200 response = client.get(url_for('main.sign_in', follow_redirects=True))
# assert 'Create an account' in response.get_data(as_text=True) assert response.location == url_for('main.choose_service', _external=True)
def test_process_register_creates_new_user(app_, def test_process_register_creates_new_user(app_,

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

@@ -17,6 +17,22 @@ def test_render_sign_in_returns_sign_in_template(app_):
assert 'Forgotten password?' in response.get_data(as_text=True) assert 'Forgotten password?' in response.get_data(as_text=True)
def test_logged_in_user_redirects_to_choose_service(app_,
db_,
db_session,
mock_api_user,
mock_user_loader,
mock_user_dao_get_by_email):
with app_.test_request_context():
with app_.test_client() as client:
client.login(mock_api_user)
response = client.get(url_for('main.sign_in'))
assert response.status_code == 302
response = client.get(url_for('main.sign_in', follow_redirects=True))
assert response.location == url_for('main.choose_service', _external=True)
def test_process_sign_in_return_2fa_template(app_, def test_process_sign_in_return_2fa_template(app_,
db_, db_,
db_session, db_session,
@@ -35,7 +51,7 @@ def test_process_sign_in_return_2fa_template(app_,
assert response.location == 'http://localhost/two-factor' assert response.location == 'http://localhost/two-factor'
@pytest.mark.xfail(reason='User failed logins not implemented yet') @pytest.mark.skip(True, reason='User failed logins not implemented yet')
def test_should_return_locked_out_true_when_user_is_locked(app_, def test_should_return_locked_out_true_when_user_is_locked(app_,
db_, db_,
db_session, db_session,
@@ -64,47 +80,47 @@ def test_should_return_locked_out_true_when_user_is_locked(app_,
assert 'Username or password is incorrect' in response.get_data(as_text=True) assert 'Username or password is incorrect' in response.get_data(as_text=True)
# @pytest.mark.xfail(reason='User failed logins not implemented yet') @pytest.mark.skip(True, reason='User failed logins not implemented yet')
# def test_should_return_active_user_is_false_if_user_is_inactive(app_, def test_should_return_active_user_is_false_if_user_is_inactive(app_,
# db_, db_,
# db_session, db_session,
# mock_user_dao_get_user, mock_user_dao_get_user,
# mock_inactive_user_dao_get_by_email): mock_inactive_user_dao_get_by_email):
# with app_.test_request_context(): with app_.test_request_context():
# response = app_.test_client().post( response = app_.test_client().post(
# url_for('main.sign_in'), data={ url_for('main.sign_in'), data={
# 'email_address': 'inactive_user@example.gov.uk', 'email_address': 'inactive_user@example.gov.uk',
# 'password': 'val1dPassw0rd!'}) 'password': 'val1dPassw0rd!'})
# assert response.status_code == 200 assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True) assert 'Username or password is incorrect' in response.get_data(as_text=True)
# def test_should_return_200_when_user_does_not_exist(app_, db_, db_session, def test_should_return_200_when_user_does_not_exist(app_, db_, db_session,
# mock_user_dao_get_user, mock_user_dao_get_user,
# mock_user_dao_get_by_email): mock_user_dao_get_by_email):
# with app_.test_request_context(): with app_.test_request_context():
# response = app_.test_client().post( response = app_.test_client().post(
# url_for('main.sign_in'), data={ url_for('main.sign_in'), data={
# 'email_address': 'does_not_exist@gov.uk', 'email_address': 'does_not_exist@gov.uk',
# 'password': 'doesNotExist!'}) 'password': 'doesNotExist!'})
# assert response.status_code == 200 assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True) assert 'Username or password is incorrect' in response.get_data(as_text=True)
# def test_should_return_200_when_user_is_not_active(app_, db_, db_session): def test_should_return_200_when_user_is_not_active(app_, db_, db_session):
# user = User(email_address='PendingUser@example.gov.uk', user = User(email_address='PendingUser@example.gov.uk',
# password='val1dPassw0rd!', password='val1dPassw0rd!',
# mobile_number='+441234123123', mobile_number='+441234123123',
# name='pending user', name='pending user',
# created_at=datetime.now(), created_at=datetime.now(),
# role_id=1, role_id=1,
# state='pending') state='pending')
# users_dao.insert_user(user) users_dao.insert_user(user)
# with app_.test_request_context(): with app_.test_request_context():
# response = app_.test_client().post( response = app_.test_client().post(
# url_for('main.sign_in'), data={ url_for('main.sign_in'), data={
# 'email_address': 'PendingUser@example.gov.uk', 'email_address': 'PendingUser@example.gov.uk',
# 'password': 'val1dPassw0rd!'}) 'password': 'val1dPassw0rd!'})
# assert response.status_code == 200 assert response.status_code == 200
# assert 'Username or password is incorrect' in response.get_data(as_text=True) assert 'Username or password is incorrect' in response.get_data(as_text=True)