trovesuite 1.0.22__tar.gz → 1.0.24__tar.gz

{trovesuite-1.0.22/src/trovesuite.egg-info → trovesuite-1.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.22
+Version: 1.0.24
 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.22 → trovesuite-1.0.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.22"
+version = "1.0.24"
 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.22"
+version = "1.0.24"
 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.22 → trovesuite-1.0.24}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.22",
+    version="1.0.24",
     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.22 → trovesuite-1.0.24}/src/trovesuite/auth/auth_service.py

@@ -229,26 +229,25 @@ class AuthService:
                     (tenant_id, user_id,),
                 )
 
-            # ✅ NEW: Get system-level roles from cp_user_groups and cp_assign_roles with is_system=true
+            # ✅ NEW: Get system-level roles from cp_assign_roles with is_system=true
             # NOTE: system_groups, system_user_groups, and system_assign_roles are now consolidated
             # into cp_groups, cp_user_groups, and cp_assign_roles with is_system flag
+            # Use LEFT JOIN starting from cp_assign_roles to find BOTH direct user assignments AND group-based assignments
             logger.info(f"Fetching system-level roles for user: {user_id}")
 
             system_roles = DatabaseManager.execute_query(
                 f"""
-                    SELECT DISTINCT sug.group_id, sug.user_id, sar.role_id, sar.resource_type
-                    FROM {db_settings.CORE_PLATFORM_USER_GROUPS_TABLE} sug
-                    INNER JOIN {db_settings.CORE_PLATFORM_ASSIGN_ROLES_TABLE} sar 
-                        ON sug.group_id = sar.group_id AND sug.tenant_id = sar.tenant_id
-                    WHERE sug.user_id = %s AND sug.tenant_id = %s
-                    AND sug.is_system = true
-                    AND sug.is_active = true
-                    AND sug.delete_status = 'NOT_DELETED'
-                    AND sar.is_active = true
-                    AND sar.delete_status = 'NOT_DELETED'
+                    SELECT DISTINCT COALESCE(sar.group_id::TEXT, NULL) as group_id, sar.user_id, sar.role_id, sar.resource_type
+                    FROM {db_settings.CORE_PLATFORM_ASSIGN_ROLES_TABLE} sar
+                    LEFT JOIN {db_settings.CORE_PLATFORM_USER_GROUPS_TABLE} sug 
+                        ON sar.group_id = sug.group_id AND sar.tenant_id = sug.tenant_id
+                    WHERE sar.tenant_id = 'system-tenant-id'
                     AND sar.is_system = true
+                    AND sar.delete_status = 'NOT_DELETED'
+                    AND sar.is_active = true
+                    AND (sar.user_id = %s OR (sug.user_id = %s AND sug.tenant_id = 'system-tenant-id' AND sug.is_system = true AND sug.is_active = true AND sug.delete_status = 'NOT_DELETED'))
                 """,
-                (user_id, 'system-tenant-id')
+                (user_id, user_id)
             )
 
             if system_roles:
@@ -256,23 +255,6 @@ class AuthService:
             else:
                 logger.info(f"No system-level roles found for user: {user_id}")
 
-            # ✅ NEW: Also check for direct system role assignments (user_id in cp_assign_roles with is_system=true)
-            direct_system_roles = DatabaseManager.execute_query(
-                f"""
-                    SELECT DISTINCT NULL as group_id, sar.user_id, sar.role_id, sar.resource_type
-                    FROM {db_settings.CORE_PLATFORM_ASSIGN_ROLES_TABLE} sar
-                    WHERE sar.user_id = %s AND sar.tenant_id = %s
-                    AND sar.is_active = true
-                    AND sar.delete_status = 'NOT_DELETED'
-                    AND sar.is_system = true
-                """,
-                (user_id, 'system-tenant-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)}")
@@ -302,9 +284,7 @@ class AuthService:
                     except Exception as e:
                         logger.warning(f"Error checking system roles: {str(e)}")
                         # Fallback: use system_roles query results
-                        system_role_ids = {r["role_id"] for r in system_roles} if system_roles else set()
-                        if direct_system_roles:
-                            system_role_ids.update({r["role_id"] for r in direct_system_roles})
+                        system_role_ids = {r.get("role_id") for r in system_roles if r.get("role_id")} if system_roles else set()
             
             for role in all_roles:
                 role_id = role.get("role_id")

{trovesuite-1.0.22 → trovesuite-1.0.24}/src/trovesuite/configs/settings.py

@@ -81,6 +81,7 @@ class Settings:
     CORE_PLATFORM_ASSIGN_LOCATIONS_TABLE = os.getenv("CORE_PLATFORM_ASSIGN_LOCATIONS_TABLE", "core_platform.cp_assign_locations")
     CORE_PLATFORM_UNIT_OF_MEASURE_TABLE = os.getenv("CORE_PLATFORM_UNIT_OF_MEASURE_TABLE", "core_platform.cp_unit_of_measures")
     CORE_PLATFORM_CURRENCY = os.getenv("CORE_PLATFORM_CURRENCY", "core_platform.cp_currencies")
+    CORE_PLATFORM_THEMES_TABLE = os.getenv("CORE_PLATFORM_THEMES_TABLE", "core_platform.cp_themes")
 
     # Mail Configurations
     MAIL_SENDER_EMAIL=os.getenv("MAIL_SENDER_EMAIL")

{trovesuite-1.0.22 → trovesuite-1.0.24}/src/trovesuite/utils/helper.py

@@ -97,8 +97,7 @@ class Helper:
             try:
                 if tenant_id:
                     # For tenant-specific resource IDs, check shared schema with tenant_id filter
-                    # Note: TENANT_RESOURCE_ID_TABLE needs to be defined in settings
-                    tenant_resource_table = getattr(db_settings, 'TENANT_RESOURCE_ID_TABLE', None)
+                    tenant_resource_table = getattr(db_settings, 'CORE_PLATFORM_TENANT_RESOURCE_ID_TABLE', None) or getattr(db_settings, 'CORE_PLATFORM_RESOURCE_ID_TABLE', None)
                     if tenant_resource_table:
                         resource_exists = DatabaseManager.execute_scalar(
                             f"""SELECT COUNT(1) FROM {tenant_resource_table}
@@ -110,7 +109,7 @@ class Helper:
                         resource_exists = 0
                 else:
                     # For main schema resource IDs
-                    main_resource_table = getattr(db_settings, 'MAIN_RESOURCE_ID_TABLE', None)
+                    main_resource_table = getattr(db_settings, 'CORE_PLATFORM_RESOURCE_ID_TABLE', None)
                     if main_resource_table:
                         resource_exists = DatabaseManager.execute_scalar(
                             f"""SELECT COUNT(1) FROM {main_resource_table}
@@ -236,9 +235,9 @@ class Helper:
 
         try:
             # Check if table name is set
-            tenant_activity_logs_table = getattr(db_settings, 'TENANT_ACTIVITY_LOGS_TABLE', None)
+            tenant_activity_logs_table = getattr(db_settings, 'CORE_PLATFORM_ACTIVITY_LOGS_TABLE', None)
             if not tenant_activity_logs_table:
-                logger.error("TENANT_ACTIVITY_LOGS_TABLE is not configured in settings")
+                logger.error("CORE_PLATFORM_ACTIVITY_LOGS_TABLE is not configured in settings")
                 return
 
             log_id = Helper.generate_unique_identifier(prefix="alog")
@@ -263,7 +262,7 @@ class Helper:
             if user_id:
                 try:
                     logger.debug(f"Fetching user information for user_id={user_id}")
-                    main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.cp_users')
+                    main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
                     user_data = DatabaseManager.execute_query(
                         f"""SELECT email, contact, fullname
                         FROM {main_users_table}
@@ -414,10 +413,10 @@ class Helper:
         """
         try:
             # Get table names from settings with fallbacks
-            main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.users')
-            main_roles_table = getattr(db_settings, 'MAIN_ROLES_TABLE', 'main.roles')
-            tenant_assign_roles_table = getattr(db_settings, 'TENANT_ASSIGN_ROLES_TABLE', 'main.tenant_assign_roles')
-            tenant_user_groups_table = getattr(db_settings, 'TENANT_USER_GROUPS_TABLE', 'main.tenant_user_groups')
+            main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
+            main_roles_table = getattr(db_settings, 'CORE_PLATFORM_ROLES_TABLE', 'core_platform.cp_roles')
+            tenant_assign_roles_table = getattr(db_settings, 'CORE_PLATFORM_ASSIGN_ROLES_TABLE', 'core_platform.cp_assign_roles')
+            tenant_user_groups_table = getattr(db_settings, 'CORE_PLATFORM_USER_GROUPS_TABLE', 'core_platform.cp_user_groups')
 
             # Query to get users with admin roles - both direct and through groups
             query = f"""
@@ -568,7 +567,7 @@ class Helper:
             actor_email = "no-reply@trovesuite.com"
 
             if actor_user_id:
-                main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.cp_users')
+                main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
                 actor_details = DatabaseManager.execute_query(
                     f"""SELECT fullname, email
                         FROM {main_users_table}

{trovesuite-1.0.22 → trovesuite-1.0.24/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.22
+Version: 1.0.24
 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