trovesuite 1.0.12__tar.gz → 1.0.13__tar.gz

{trovesuite-1.0.12/src/trovesuite.egg-info → trovesuite-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.12
+Version: 1.0.13
 Summary: TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu

{trovesuite-1.0.12 → trovesuite-1.0.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.12"
+version = "1.0.13"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 authors = ["brightgclt <brightgclt@gmail.com>"]
 license = "MIT"
@@ -58,7 +58,7 @@ Documentation = "https://dev.azure.com/brightgclt/trovesuite/_git/packages"
 
 [project]
 name = "trovesuite"
-version = "1.0.12"
+version = "1.0.13"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 readme = "README.md"
 license = {text = "MIT"}

{trovesuite-1.0.12 → trovesuite-1.0.13}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.12",
+    version="1.0.13",
     author="Bright Debrah Owusu",
     author_email="owusu.debrah@deladetech.com",
     description="TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications",

{trovesuite-1.0.12 → trovesuite-1.0.13}/src/trovesuite/auth/auth_service.py

@@ -225,18 +225,62 @@ class AuthService:
                     (user_id,),
                 )
 
+            # ✅ NEW: Get system-level roles from main.system_user_groups and main.system_assign_roles
+            logger.info(f"Fetching system-level roles for user: {user_id}")
+
+            system_roles = DatabaseManager.execute_query(
+                """
+                    SELECT DISTINCT sug.group_id, sug.user_id, sar.role_id, sar.resource_type
+                    FROM main.system_user_groups sug
+                    INNER JOIN main.system_assign_roles sar ON sug.group_id = sar.group_id
+                    WHERE sug.user_id = %s
+                    AND sug.delete_status = 'NOT_DELETED'
+                    AND sar.is_active = true
+                    AND sar.delete_status = 'NOT_DELETED'
+                """,
+                (user_id,)
+            )
+
+            if system_roles:
+                logger.info(f"Found {len(system_roles)} system-level role(s) for user: {user_id}")
+            else:
+                logger.info(f"No system-level roles found for user: {user_id}")
+
+            # ✅ NEW: Also check for direct system role assignments (user_id in system_assign_roles)
+            direct_system_roles = DatabaseManager.execute_query(
+                """
+                    SELECT DISTINCT NULL as group_id, sar.user_id, sar.role_id, sar.resource_type
+                    FROM main.system_assign_roles sar
+                    WHERE sar.user_id = %s
+                    AND sar.is_active = true
+                    AND sar.delete_status = 'NOT_DELETED'
+                """,
+                (user_id,)
+            )
+
+            if direct_system_roles:
+                logger.info(f"Found {len(direct_system_roles)} direct system-level role assignment(s) for user: {user_id}")
+                system_roles.extend(direct_system_roles)
+
+            # ✅ NEW: Merge tenant-level and system-level roles
+            all_roles = get_user_roles + system_roles
+            logger.info(f"Total roles (tenant + system) for user {user_id}: {len(all_roles)}")
+
             # GET permissions and Append to Role
             get_user_roles_with_tenant_and_permissions = []
-            for role in get_user_roles:
+            for role in all_roles:
                 permissions = DatabaseManager.execute_query(
                     f"""SELECT permission_id FROM {db_settings.MAIN_ROLE_PERMISSIONS_TABLE} WHERE role_id = %s""",
-                    params=(role["role_id"],),)
+                    params=(role["role_id"],),
+                )
 
                 role_dict = {**role, "tenant_id": tenant_id, "permissions": [p['permission_id'] for p in permissions]}
                 get_user_roles_with_tenant_and_permissions.append(role_dict)
 
             roles_dto = Helper.map_to_dto(get_user_roles_with_tenant_and_permissions, AuthServiceReadDto)
 
+            logger.info(f"Authorization successful for user: {user_id} with {len(roles_dto)} total role entries")
+
             return Respons[AuthServiceReadDto](
                 detail="Authorized",
                 data=roles_dto,
@@ -249,7 +293,7 @@ class AuthService:
             raise http_ex
 
         except Exception as e:
-            logger.error("Authorization check failed for user: %s", str(e))
+            logger.error("Authorization check failed for user: %s - Error: %s", user_id, str(e), exc_info=True)
             return Respons[AuthServiceReadDto](
                 detail=None,
                 data=[],
@@ -258,6 +302,7 @@ class AuthService:
                 error="Authorization check failed due to an internal error"
             )
 
+
     @staticmethod
     def check_permission(users_data: list, action=None, resource_type=None) -> bool:
         """

{trovesuite-1.0.12 → trovesuite-1.0.13/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.12
+Version: 1.0.13
 Summary: TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu