Merge pull request #379 from dod-ccpo/logged-in-redirect
Root url should redirect if user is already logged in
This commit is contained in:
commit
72f65cac9b
@ -67,6 +67,7 @@ def make_app(config):
|
|||||||
def make_flask_callbacks(app):
|
def make_flask_callbacks(app):
|
||||||
@app.before_request
|
@app.before_request
|
||||||
def _set_globals():
|
def _set_globals():
|
||||||
|
g.current_user = None
|
||||||
g.dev = os.getenv("FLASK_ENV", "dev") == "dev"
|
g.dev = os.getenv("FLASK_ENV", "dev") == "dev"
|
||||||
g.matchesPath = lambda href: re.match("^" + href, request.path)
|
g.matchesPath = lambda href: re.match("^" + href, request.path)
|
||||||
g.modal = request.args.get("modal", None)
|
g.modal = request.args.get("modal", None)
|
||||||
@ -74,7 +75,7 @@ def make_flask_callbacks(app):
|
|||||||
|
|
||||||
@app.after_request
|
@app.after_request
|
||||||
def _cleanup(response):
|
def _cleanup(response):
|
||||||
g.pop("current_user", None)
|
g.current_user = None
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
@ -18,6 +18,9 @@ bp = Blueprint("atst", __name__)
|
|||||||
|
|
||||||
@bp.route("/")
|
@bp.route("/")
|
||||||
def root():
|
def root():
|
||||||
|
if g.current_user:
|
||||||
|
return redirect(url_for(".home"))
|
||||||
|
|
||||||
redirect_url = app.config.get("CAC_URL")
|
redirect_url = app.config.get("CAC_URL")
|
||||||
if request.args.get("next"):
|
if request.args.get("next"):
|
||||||
redirect_url = url.urljoin(
|
redirect_url = url.urljoin(
|
||||||
|
7
tests/routes/test_root.py
Normal file
7
tests/routes/test_root.py
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
from tests.factories import UserFactory
|
||||||
|
|
||||||
|
|
||||||
|
def test_root_redirects_if_user_is_logged_in(client, user_session):
|
||||||
|
user_session(UserFactory.create())
|
||||||
|
response = client.get("/", follow_redirects=False)
|
||||||
|
assert "home" in response.location
|
@ -4,7 +4,6 @@ import pytest
|
|||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"path",
|
"path",
|
||||||
(
|
(
|
||||||
"/",
|
|
||||||
"/workspaces",
|
"/workspaces",
|
||||||
"/requests",
|
"/requests",
|
||||||
"/requests/new/1",
|
"/requests/new/1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user