trovesuite 1.0.13__tar.gz → 1.0.16__tar.gz

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.13"
+version = "1.0.16"
 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.13"
+version = "1.0.16"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 readme = "README.md"
 license = {text = "MIT"}
@@ -121,7 +121,7 @@ Documentation = "https://dev.azure.com/brightgclt/trovesuite/_git/packages"
 [tool.setuptools.packages.find]
 where = ["src"]
 include = ["trovesuite*"]
-exclude = ["*controller*", "*main*", "*test*"]
+exclude = ["*test*"]
 
 [tool.setuptools.package-dir]
 "" = "src"

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

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

@@ -3,19 +3,21 @@ TroveSuite Package
 
 A comprehensive authentication, authorization, notification, and storage service for ERP systems.
 Provides JWT token validation, user authorization, permission checking, notification capabilities,
-and Azure Storage blob management.
+Azure Storage blob management, and utility functions for multi-tenant applications.
 """
 
 from .auth import AuthService
 from .notification import NotificationService
 from .storage import StorageService
+from .utils import Helper
 
-__version__ = "1.0.7"
+__version__ = "1.0.16"
 __author__ = "Bright Debrah Owusu"
 __email__ = "owusu.debrah@deladetech.com"
 
 __all__ = [
     "AuthService",
     "NotificationService",
-    "StorageService"
+    "StorageService",
+    "Helper",
 ]

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

@@ -229,12 +229,11 @@ class AuthService:
             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 main.system_user_groups sug
-                    INNER JOIN main.system_assign_roles sar ON sug.group_id = sar.group_id
+                    FROM {db_settings.MAIN_SYSTEM_USER_GROUPS_TABLE} sug
+                    INNER JOIN {db_settings.MAIN_SYSTEM_ASSIGN_ROLES_TABLE} 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'
                 """,
@@ -248,9 +247,9 @@ class AuthService:
 
             # ✅ NEW: Also check for direct system role assignments (user_id in system_assign_roles)
             direct_system_roles = DatabaseManager.execute_query(
-                """
+                f"""
                     SELECT DISTINCT NULL as group_id, sar.user_id, sar.role_id, sar.resource_type
-                    FROM main.system_assign_roles sar
+                    FROM {db_settings.MAIN_SYSTEM_ASSIGN_ROLES_TABLE} sar
                     WHERE sar.user_id = %s
                     AND sar.is_active = true
                     AND sar.delete_status = 'NOT_DELETED'
@@ -347,18 +346,34 @@ class AuthService:
     def authorize_user_from_token(token: str) -> Respons[AuthServiceReadDto]:
         """
         Convenience method to authorize a user directly from a JWT token.
-        
+
         Args:
             token: JWT token string
-            
+
         Returns:
             Respons[AuthServiceReadDto]: Authorization result with user roles and permissions
-            
+
         Raises:
             HTTPException: If token is invalid
         """
-        user_info = AuthService.decode_token(token)
-        return AuthService.authorize(user_info["user_id"], user_info["tenant_id"])
+        credentials_exception = HTTPException(
+            status_code=401,
+            detail="Could not validate credentials",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+        try:
+            payload = jwt.decode(token, db_settings.SECRET_KEY, algorithms=[db_settings.ALGORITHM])
+            user_id = payload.get("user_id")
+            tenant_id = payload.get("tenant_id")
+
+            if user_id is None or tenant_id is None:
+                raise credentials_exception
+
+            data = AuthServiceWriteDto(user_id=user_id, tenant_id=tenant_id)
+            return AuthService.authorize(data=data)
+
+        except jwt.InvalidTokenError as exc:
+            raise credentials_exception from exc
     
     @staticmethod
     def get_user_permissions(user_roles: list) -> list:

{trovesuite-1.0.13 → trovesuite-1.0.16}/src/trovesuite/configs/settings.py

@@ -32,11 +32,16 @@ class Settings:
     # =============================================================================
     # SHARED TABLES (main schema)
     # =============================================================================
-    MAIN_TENANTS_TABLE = os.getenv("MAIN_TENANTS_TABLE")
-    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE")
-    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE")
-    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE")
-    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE")
+    MAIN_TENANTS_TABLE = os.getenv("MAIN_TENANTS_TABLE", "main.tenants")
+    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE", "main.role_permissions")
+    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE", "main.user_subscriptions")
+    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE", "main.user_subscription_history")
+    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE", "main.subscriptions")
+
+    # System-level tables
+    MAIN_SYSTEM_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_GROUPS_TABLE", "main.system_groups")
+    MAIN_SYSTEM_USER_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_USER_GROUPS_TABLE", "main.system_user_groups")
+    MAIN_SYSTEM_ASSIGN_ROLES_TABLE = os.getenv("MAIN_SYSTEM_ASSIGN_ROLES_TABLE", "main.system_assign_roles")
 
     # =============================================================================
     # TENANT-SPECIFIC TABLES (tenant schemas)

{trovesuite-1.0.13 → trovesuite-1.0.16}/src/trovesuite/utils/__init__.py

@@ -5,7 +5,9 @@ Utility functions and helpers for TroveSuite services.
 """
 
 from .helper import Helper
+from . import templates
 
 __all__ = [
-    "Helper"
+    "Helper",
+    "templates",
 ]