1 files changed, 14 insertions, 0 deletions
diff --git a/nfsw/auth.py b/nfsw/auth.py
index 654f6c2..697f89e 100644
--- a/nfsw/auth.py
+++ b/nfsw/auth.py
@@ -165,3 +165,17 @@ def logout():
     return redirect(url_for('index'))
 
 
+@bp.before_app_request
+def load_logged_in_user():
+    user_id = session.get('user_id')
+
+    if user_id is None:
+        g.user = None
+    else:
+        g.user = get_db().execute(
+            'SELECT * FROM user WHERE id=?', (user_id,)
+        ).fetchone()
+
+        if (request.endpoint not in ['auth.terms', 'auth.sorry']
+            and g.user['terms_agreed'] != 1):
+            return redirect(url_for('auth.terms'))