- error handling now uses a more comprehensive error communication system.

common/utils/errors.py

@@ -10,41 +10,54 @@ from common.utils.nginx_utils import prefixed_url_for
 
 
 def not_found_error(error):
-    if not current_user.is_authenticated:
-        return redirect(prefixed_url_for('security.login'))
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
+    if profile == 'web_app':
+        if not current_user.is_authenticated:
+            return redirect(prefixed_url_for('security.login', for_redirect=True))
     current_app.logger.error(f"Not Found Error: {error}")
     current_app.logger.error(traceback.format_exc())
     return render_template('error/404.html'), 404
 
 
 def internal_server_error(error):
-    if not current_user.is_authenticated:
-        return redirect(prefixed_url_for('security.login'))
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
+    if profile == 'web_app':
+        if not current_user.is_authenticated:
+            return redirect(prefixed_url_for('security.login', for_redirect=True))
     current_app.logger.error(f"Internal Server Error: {error}")
     current_app.logger.error(traceback.format_exc())
     return render_template('error/500.html'), 500
 
 
 def not_authorised_error(error):
-    if not current_user.is_authenticated:
-        return redirect(prefixed_url_for('security.login'))
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
+    if profile == 'web_app':
+        if not current_user.is_authenticated:
+            return redirect(prefixed_url_for('security.login', for_redirect=True))
     current_app.logger.error(f"Not Authorised Error: {error}")
     current_app.logger.error(traceback.format_exc())
-    return render_template('error/401.html')
+    return render_template('error/401.html'), 401
 
 
 def access_forbidden(error):
-    if not current_user.is_authenticated:
-        return redirect(prefixed_url_for('security.login'))
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
+    if profile == 'web_app':
+        if not current_user.is_authenticated:
+            return redirect(prefixed_url_for('security.login', for_redirect=True))
     current_app.logger.error(f"Access Forbidden: {error}")
     current_app.logger.error(traceback.format_exc())
-    return render_template('error/403.html')
+    return render_template('error/403.html'), 403
 
 
 def key_error_handler(error):
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
     # Check if the KeyError is specifically for 'tenant'
     if str(error) == "'tenant'":
-        return redirect(prefixed_url_for('security.login'))
+        if profile == 'web_app':
+            return redirect(prefixed_url_for('security.login', for_redirect=True))
+        else:
+            current_app.logger.warning("Session tenant missing in chat_client context")
+            return render_template('error/401.html'), 401
     # For other KeyErrors, you might want to log the error and return a generic error page
     current_app.logger.error(f"Key Error: {error}")
     current_app.logger.error(traceback.format_exc())
@@ -79,19 +92,24 @@ def no_tenant_selected_error(error):
     """Handle errors when no tenant is selected in the current session.
 
     This typically happens when a session expires or becomes invalid after
-    a long period of inactivity. The user will be redirected to the login page.
+    a long period of inactivity. The user will be redirected to the login page (web_app)
+    or shown an error page (chat_client).
     """
+    profile = current_app.config.get('ERRORS_PROFILE', 'web_app')
     current_app.logger.error(f"No Session Tenant Error: {error}")
     current_app.logger.error(traceback.format_exc())
     flash('Your session expired. You will have to re-enter your credentials', 'warning')
 
-    # Perform logout if user is authenticated
-    if current_user.is_authenticated:
-        from flask_security.utils import logout_user
-        logout_user()
-
-    # Redirect to login page
-    return redirect(prefixed_url_for('security.login'))
+    if profile == 'web_app':
+        # Perform logout if user is authenticated
+        if current_user.is_authenticated:
+            from flask_security.utils import logout_user
+            logout_user()
+        # Redirect to login page
+        return redirect(prefixed_url_for('security.login', for_redirect=True))
+    else:
+        # chat_client: render 401 page
+        return render_template('error/401.html'), 401
 
 
 def general_exception(e):
@@ -122,7 +140,10 @@ def template_syntax_error(error):
                           error_details=f"Error in template '{error.filename}' at line {error.lineno}: {error.message}"), 500
 
 
-def register_error_handlers(app):
+def register_error_handlers(app, profile: str = 'web_app'):
+    # Store profile in app config to drive handler behavior
+    app.config['ERRORS_PROFILE'] = profile
+    
     app.register_error_handler(404, not_found_error)
     app.register_error_handler(500, internal_server_error)
     app.register_error_handler(401, not_authorised_error)