Merge pull request #360 from dod-ccpo/redirect-after-login-#160851186

Redirect after login #160851186

atst/domain/auth.py

@@ -21,7 +21,7 @@ def apply_authentication(app):
         if user:
             g.current_user = user
         elif not _unprotected_route(request):
-            return redirect(url_for("atst.root"))
+            return redirect(url_for("atst.root", next=request.path))
 
 
 def get_current_user():

atst/routes/__init__.py

@@ -1,4 +1,6 @@
+import urllib.parse as url
 from flask import Blueprint, render_template, g, redirect, session, url_for, request
+
 from flask import current_app as app
 import pendulum
 
@@ -15,7 +17,16 @@ bp = Blueprint("atst", __name__)
 
 @bp.route("/")
 def root():
-    return render_template("login.html")
+    redirect_url = app.config.get("CAC_URL")
+    if request.args.get("next"):
+        redirect_url = url.urljoin(
+            redirect_url,
+            "?{}".format(url.urlencode({"next": request.args.get("next")})),
+        )
+
+    return render_template(
+        "login.html", redirect=bool(request.args.get("next")), redirect_url=redirect_url
+    )
 
 
 @bp.route("/help")
@@ -70,6 +81,13 @@ def _make_authentication_context():
     )
 
 
+def redirect_after_login_url():
+    if request.args.get("next"):
+        return request.args.get("next")
+    else:
+        return url_for("atst.home")
+
+
 @bp.route("/login-redirect")
 def login_redirect():
     auth_context = _make_authentication_context()
@@ -77,13 +95,13 @@ def login_redirect():
     user = auth_context.get_user()
     session["user_id"] = user.id
 
-    return redirect(url_for(".home"))
+    return redirect(redirect_after_login_url())
 
 
 @bp.route("/logout")
 def logout():
     _logout()
-    return redirect(url_for(".home"))
+    return redirect(url_for(".root"))
 
 
 @bp.route("/activity-history")

atst/routes/dev.py

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