New Site_Login capability

hitier
1 parent 08d06308
Showing 3 changed files with 29 additions and 6 deletions Show diff stats
app/auth/routes.py
app/main/routes.py
resources/pdc_config.py
@@ -20,7 +20,7 @@ def role_required(role):
                 if current_app.config['ROLE_DISABLED']:
                     return f(*args, **kwargs)
             except KeyError:
-                # no such config
+                # no such config, juste ignore
                 pass
             # first check use is logged in
             if not current_user or not current_user.is_authenticated:
 import json
  
-from flask import render_template, make_response, current_app
-from flask_login import login_required
+from flask import render_template, make_response, current_app, redirect, url_for, request
+from flask_login import login_required, current_user
  
 from . import bp
  
@@ -10,6 +10,21 @@ from app import db_mgr
 from app.auth.routes import role_required
  
  
+@bp.before_request
+def site_login():
+    try:
+        if current_app.config['SITE_LOGIN'] \
+                and not current_user.is_authenticated:
+            return redirect(url_for('auth.login'))
+    except KeyError:
+        # no such config, juste ignore
+        pass
+
+@bp.before_request
+def catch_all_route():
+    current_app.logger.info(f"{request.method} {request.path}")
+
+
 @bp.route('/')
 def index():
     return render_template('index.html', subtitle="Page d'accueil")
@@ -40,7 +55,6 @@ def projects():
 @bp.route('/agents')
 @role_required('project')
 def agents():
-    current_app.logger.info("Accessing agents page")
     # get agents list
     all_agents = Agent.query.order_by(Agent.firstname).all()
     num_agents = len(all_agents)
@@ -80,7 +94,6 @@ def charge_add():
 @bp.route('/charge/agent/<agent_id>')
 @role_required('service')
 def charge_agent(agent_id):
-    current_app.logger.info("Accessing agent {} page".format(agent_id))
     agent_charges = []
     for [period, charge] in db_mgr.charges_by_agent(agent_id):
         agent_charges.append({"charge": charge, "periode": period})
@@ -20,7 +20,17 @@ class Config(object):
     PDC_LOGS_DIR = os.path.join(root_dir, 'logs')
     PDC_LOGS_FILE = os.path.join(PDC_LOGS_DIR, 'pdc.log')
  
-    # ROLE_DISABLED = False  # Override for role access control
+    # Uncomment for role access control
+    #   if True, will disable any role control on routes
+    #   note that this doesnt disable the @login_required
+    #
+    # ROLE_DISABLED = False
+
+    # Uncomment for site access control
+    #   if True, will force login access on any site page 
+    #   note that this doesnt disable the @login_required 
+    #
+    # SITE_LOGIN = False
  
     #
     # No need to Edit below