pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more explicit naming, query param handling for login redirects

Browse Source
This commit is contained in:
dandds 2018-10-01 16:16:17 -04:00
parent 4eaea6c055
commit 509b4c55a2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
atst/routes/__init__.py
View File

@ -20,7 +20,8 @@ def root():
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(
redirect_url, "?{}".format(url.urlencode(request.args)) redirect_url,
"?{}".format(url.urlencode({"next": request.args.get("next")})),
) )
return render_template( return render_template(
@ -80,11 +81,11 @@ def _make_authentication_context():
) )
def redirect_url(): def redirect_after_login_url():
if request.args.get("next"): if request.args.get("next"):
return request.args.get("next") return request.args.get("next")
else: else:
return url_for(".home") return url_for("atst.home")
@bp.route("/login-redirect") @bp.route("/login-redirect")
@ -94,7 +95,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(redirect_url()) return redirect(redirect_after_login_url())
@bp.route("/logout") @bp.route("/logout")

4
atst/routes/dev.py
View File

@ -1,6 +1,6 @@
from flask import Blueprint, request, session, redirect from flask import Blueprint, request, session, redirect
from . import redirect_url from . import redirect_after_login_url
from atst.domain.users import Users from atst.domain.users import Users
bp = Blueprint("dev", __name__) bp = Blueprint("dev", __name__)
@ -64,4 +64,4 @@ def login_dev():
) )
session["user_id"] = user.id session["user_id"] = user.id
return redirect(redirect_url()) return redirect(redirect_after_login_url())