Force user to fill out their user profile

atst/domain/auth.py

@@ -21,10 +21,26 @@ def apply_authentication(app):
         user = get_current_user()
         if user:
             g.current_user = user
+            if should_redirect_to_user_profile(request, user):
+                return redirect(url_for("users.user", next=request.path))
         elif not _unprotected_route(request):
             return redirect(url_for("atst.root", next=request.path))
 
 
+def should_redirect_to_user_profile(request, user):
+    has_complete_profile = user.profile_complete
+    is_unprotected_route = _unprotected_route(request)
+    is_requesting_user_endpoint = request.endpoint in [
+        "users.user",
+        "users.update_user",
+    ]
+
+    if has_complete_profile or is_unprotected_route or is_requesting_user_endpoint:
+        return False
+
+    return True
+
+
 def get_current_user():
     user_id = session.get("user_id")
     if user_id:

atst/routes/users.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, render_template, g, request as http_request
+from flask import Blueprint, render_template, g, request as http_request, redirect
 from atst.forms.edit_user import EditUserForm
 from atst.domain.users import Users
 
@@ -10,16 +10,21 @@ bp = Blueprint("users", __name__)
 def user():
     user = g.current_user
     form = EditUserForm(data=user.to_dictionary())
-    return render_template("user/edit.html", form=form, user=user)
+    return render_template(
+        "user/edit.html", next=http_request.args.get("next"), form=form, user=user
+    )
 
 
 @bp.route("/user", methods=["POST"])
 def update_user():
     user = g.current_user
     form = EditUserForm(http_request.form)
-    rerender_args = {"form": form, "user": user}
+    next_url = http_request.args.get("next")
+    rerender_args = {"form": form, "user": user, "next": next_url}
     if form.validate():
         Users.update(user, form.data)
         rerender_args["updated"] = True
+        if next_url:
+            return redirect(next_url)
 
     return render_template("user/edit.html", **rerender_args)