Redirect to home after login, which redirects elsewhere

This commit is contained in:
richard-dds 2018-09-05 10:39:05 -04:00
parent 2e77387d98
commit fa105a95e3
5 changed files with 7 additions and 10 deletions

View File

@ -17,7 +17,7 @@ def root():
@bp.route("/home") @bp.route("/home")
def home(): def home():
return render_template("home.html") return redirect(url_for("requests.requests_index"))
@bp.route("/styleguide") @bp.route("/styleguide")
@ -46,7 +46,7 @@ def login_redirect():
user = auth_context.get_user() user = auth_context.get_user()
session["user_id"] = user.id session["user_id"] = user.id
return redirect(url_for("requests.requests_index")) return redirect(url_for(".home"))
def _is_valid_certificate(request): def _is_valid_certificate(request):

View File

@ -63,4 +63,4 @@ def login_dev():
) )
session["user_id"] = user.id session["user_id"] = user.id
return redirect(url_for("requests.requests_index")) return redirect(url_for("atst.home"))

View File

@ -8,12 +8,12 @@ def test_user_with_workspaces_has_workspaces_nav(client, user_session):
Workspaces._create_workspace_role(user, workspace, "default") Workspaces._create_workspace_role(user, workspace, "default")
user_session(user) user_session(user)
response = client.get("/home") response = client.get("/home", follow_redirects=True)
assert b'href="/workspaces"' in response.data assert b'href="/workspaces"' in response.data
def test_user_without_workspaces_has_no_workspaces_nav(client, user_session): def test_user_without_workspaces_has_no_workspaces_nav(client, user_session):
user = UserFactory.create() user = UserFactory.create()
user_session(user) user_session(user)
response = client.get("/home") response = client.get("/home", follow_redirects=True)
assert b'href="/workspaces"' not in response.data assert b'href="/workspaces"' not in response.data

View File

@ -33,7 +33,7 @@ def test_successful_login_redirect_non_ccpo(client, monkeypatch):
) )
assert resp.status_code == 302 assert resp.status_code == 302
assert "requests" in resp.headers["Location"] assert "home" in resp.headers["Location"]
assert session["user_id"] assert session["user_id"]
@ -57,7 +57,7 @@ def test_successful_login_redirect_ccpo(client, monkeypatch):
) )
assert resp.status_code == 302 assert resp.status_code == 302
assert "requests" in resp.headers["Location"] assert "home" in resp.headers["Location"]
assert session["user_id"] assert session["user_id"]
@ -119,8 +119,6 @@ def test_crl_validation_on_login(client):
"HTTP_X_SSL_CLIENT_CERT": good_cert, "HTTP_X_SSL_CLIENT_CERT": good_cert,
}, },
) )
assert resp.status_code == 302
assert "requests" in resp.headers["Location"]
assert session["user_id"] assert session["user_id"]

View File

@ -5,7 +5,6 @@ import pytest
"path", "path",
( (
"/", "/",
"/home",
"/workspaces", "/workspaces",
"/requests", "/requests",
"/requests/new/1", "/requests/new/1",