trovesuite 1.0.33__tar.gz → 1.0.35__tar.gz

{trovesuite-1.0.33/src/trovesuite.egg-info → trovesuite-1.0.35}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.33"
+version = "1.0.35"
 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.33"
+version = "1.0.35"
 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.33 → trovesuite-1.0.35}/src/trovesuite/auth/auth_service.py

@@ -235,17 +235,18 @@ class AuthService:
             # 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 group membership may be stored with user's tenant_id (not system-tenant-id); join on user_id and is_system
             system_roles = DatabaseManager.execute_query(
                 f"""
                     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
+                        ON sar.group_id = sug.group_id AND sug.user_id = %s AND sug.is_system = true AND sug.is_active = true AND sug.delete_status = 'NOT_DELETED'
                     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'))
+                    AND (sar.user_id = %s OR sug.user_id IS NOT NULL)
                 """,
                 (user_id, user_id)
             )
@@ -328,7 +329,14 @@ class AuthService:
                     logger.error(f"Error querying permissions for role {role_id}: {str(e)}", exc_info=True)
                     permissions = []
 
-                role_dict = {**role, "tenant_id": tenant_id, "permissions": [p['permission_id'] for p in permissions]}
+                role_user_id = role.get("user_id") if hasattr(role, "get") else None
+                # Ensure user_id is always present (group roles can have user_id NULL)
+                role_dict = {
+                    **role,
+                    "user_id": role_user_id or user_id,
+                    "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)

{trovesuite-1.0.33 → trovesuite-1.0.35}/src/trovesuite/utils/templates.py

@@ -485,3 +485,87 @@ RESOURCE_STATUS_CHANGE_TEXT_TEMPLATE = (
     "— The Trovesuite Team\n"
     "Sent on: {cdate} at {ctime}"
 )
+
+ADMIN_SIGNUP_NOTIFICATION_TEXT_TEMPLATE = (
+    "Hi,\n\n"
+    "User {fullname} with Email: {email} and contact {contact} have signup for subscription {subscription_name} with Generated OTP: {otp_code} has sign up Successfully. Thank you.\n\n"
+    "Sent at: {cdate}, {ctime}"
+)
+
+ADMIN_SIGNUP_NOTIFICATION_HTML_TEMPLATE = """
+<html>
+  <body style="font-family: Arial, sans-serif; background-color: #f8f9fa; padding: 20px;">
+    <div style="max-width: 600px; margin: auto; background: white; border-radius: 12px; padding: 30px; box-shadow: 0 2px 8px rgba(0,0,0,0.1);">
+      <!-- Header -->
+      <div style="text-align: center; padding-bottom: 25px; border-bottom: 2px solid #2e86de;">
+        <h1 style="color: #2e86de; margin: 0; font-size: 26px;">👤 New User Signup Notification</h1>
+      </div>
+
+      <!-- Greeting -->
+      <div style="padding: 25px 0;">
+        <p style="font-size: 16px; color: #333; margin-bottom: 15px;">Hi,</p>
+        <p style="font-size: 15px; color: #333; line-height: 1.6;">
+          User <strong>{fullname}</strong> with Email: <strong>{email}</strong> and contact <strong>{contact}</strong> have signup for subscription <strong>{subscription_name}</strong> with Generated OTP: <strong>{otp_code}</strong> has sign up Successfully. Thank you.
+        </p>
+      </div>
+
+      <!-- User Details -->
+      <div style="background-color: #f8f9fa; border-radius: 8px; padding: 20px; margin: 20px 0;">
+        <h3 style="color: #2e86de; margin-top: 0; font-size: 18px; margin-bottom: 15px;">📋 Signup Details</h3>
+
+        <table style="width: 100%; border-collapse: collapse;">
+          <tr>
+            <td style="padding: 8px 0; color: #666; font-size: 14px; width: 35%;">
+              <strong>Full Name:</strong>
+            </td>
+            <td style="padding: 8px 0; color: #333; font-size: 14px;">
+              {fullname}
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 8px 0; color: #666; font-size: 14px;">
+              <strong>Email:</strong>
+            </td>
+            <td style="padding: 8px 0; color: #333; font-size: 14px;">
+              {email}
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 8px 0; color: #666; font-size: 14px;">
+              <strong>Contact:</strong>
+            </td>
+            <td style="padding: 8px 0; color: #333; font-size: 14px;">
+              {contact}
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 8px 0; color: #666; font-size: 14px;">
+              <strong>Subscription:</strong>
+            </td>
+            <td style="padding: 8px 0; color: #333; font-size: 14px;">
+              {subscription_name}
+            </td>
+          </tr>
+          <tr>
+            <td style="padding: 8px 0; color: #666; font-size: 14px;">
+              <strong>Generated OTP:</strong>
+            </td>
+            <td style="padding: 8px 0; color: #333; font-size: 14px; font-family: 'Courier New', monospace; background-color: #fff; padding: 5px 10px; border-radius: 4px; display: inline-block;">
+              {otp_code}
+            </td>
+          </tr>
+        </table>
+      </div>
+
+      <!-- Footer -->
+      <hr style="border: none; border-top: 1px solid #eee; margin: 25px 0;">
+      <div style="text-align: center;">
+        <p style="font-size: 12px; color: #888; margin: 5px 0;">
+          Trovesuite - Empowering Your Business<br>
+          Sent on: {cdate} at {ctime}
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
+"""

{trovesuite-1.0.33 → trovesuite-1.0.35/src/trovesuite.egg-info}/PKG-INFO

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