Merge pull request #245 from dod-ccpo/ccpo-redirect

Redirect CCPO to requests index after login

atst/routes/__init__.py

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

atst/routes/dev.py

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

tests/routes/test_home.py

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

tests/test_auth.py

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

tests/test_routes.py

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