Improvements to Document Interface and correcting embedding workers

common/utils/middleware.py

@@ -4,7 +4,7 @@ for handling tenant requests
 """
 
 from flask_security import current_user
-from flask import session
+from flask import session, current_app
 
 from .database import Database
 
@@ -17,12 +17,15 @@ def mw_before_request():
 
     tenant_id = session['tenant']['id']
     if not tenant_id:
-        return {"message": "You are not logged into any tenant"}, 403
+        raise Exception('Cannot switch schema for tenant: no tenant defined in session')
+
+    for role in current_user.roles:
+        current_app.logger.debug(f'In middleware: User {current_user.email} has role {role.name}')
 
     # user = User.query.get(current_user.id)
-    if current_user.has_roles(['Super User']) or current_user.tenant_id == tenant_id:
+    if current_user.has_role('Super User') or current_user.tenant_id == tenant_id:
         Database(tenant_id).switch_schema()
     else:
-        return {"message": "You are not a member of this tenant"}, 403
+        raise Exception(f'Cannot switch schema for tenant {tenant_id}: user {current_user.email} does not have access')