redirect to show_accounts_or_dashboard on login

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

View File

@@ -13,7 +13,7 @@ from flask_login import current_user, login_user
from itsdangerous import SignatureExpired
from notifications_utils.url_safe_token import check_token
from app import service_api_client, user_api_client
from app import user_api_client
from app.main import main
from app.main.forms import TwoFactorForm
from app.utils import redirect_to_sign_in
@@ -112,9 +112,4 @@ def redirect_when_logged_in(user_id):
if current_user.platform_admin:
return redirect(url_for('main.platform_admin'))
services = service_api_client.get_active_services({'user_id': str(user_id)}).get('data', [])
if len(services) == 1:
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
else:
return redirect(url_for('main.choose_account'))
return redirect(url_for('main.show_accounts_or_dashboard'))