trovesuite 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

trovesuite/auth/auth_service.py

@@ -156,7 +156,7 @@ class AuthService:
             
             # 1️⃣ Get all groups the user belongs to
             user_groups = DatabaseManager.execute_query(
-                f"""SELECT group_id FROM "{tenant_id}".{db_settings.USER_GROUPS_TABLE}
+                f"""SELECT group_id FROM "{tenant_id}".{db_settings.TENANT_USER_GROUPS_TABLE}
                     WHERE delete_status = 'NOT_DELETED' AND is_active = true AND user_id = %s""",(user_id,),
             )
 
@@ -169,7 +169,7 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (org_id, group_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id)
                             org_id, group_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id
-                        FROM "{tenant_id}".{db_settings.ASSIGN_ROLES_TABLE}
+                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
                         WHERE delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND (user_id = %s OR group_id = ANY(%s))
@@ -183,7 +183,7 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (org_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id)
                             org_id, bus_id, app_id, shared_resource_id, resource_id, user_id, role_id
-                        FROM "{tenant_id}".{db_settings.ASSIGN_ROLES_TABLE}
+                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
                         WHERE delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND user_id = %s
@@ -196,7 +196,7 @@ class AuthService:
             get_user_roles_with_tenant_and_permissions = []
             for role in get_user_roles:
                 permissions = DatabaseManager.execute_query(
-                    f"""SELECT permission_id FROM {db_settings.ROLE_PERMISSIONS_TABLE} WHERE role_id = %s""",
+                    f"""SELECT permission_id FROM {db_settings.MAIN_ROLE_PERMISSIONS_TABLE} WHERE role_id = %s""",
                     params=(role["role_id"],),)
 
                 role_dict = {**role, "tenant_id": tenant_id, "permissions": [p['permission_id'] for p in permissions]}

trovesuite/configs/settings.py

@@ -1,153 +1,57 @@
 import os
-import warnings
-from typing import Optional
-
 class Settings:
-    """Settings configuration for TroveSuite Auth Service"""
 
-    # =============================================================================
-    # DATABASE CONFIGURATION
-    # =============================================================================
-    DATABASE_URL: str = os.getenv(
-        "DATABASE_URL", 
-        "postgresql://username:password@localhost:5432/database_name"
-    )
+    # Database URL
+    DATABASE_URL: str = os.getenv("DATABASE_URL")
 
-    # Alternative database configuration
-    DB_USER: Optional[str] = os.getenv("DB_USER")
-    DB_HOST: Optional[str] = os.getenv("DB_HOST")
-    DB_NAME: Optional[str] = os.getenv("DB_NAME")
-    DB_PORT: int = int(os.getenv("DB_PORT", "5432"))
-    DB_PASSWORD: Optional[str] = os.getenv("DB_PASSWORD")
-    ENVIRONMENT: str = os.getenv("ENVIRONMENT", "development")
+    DB_USER: str = os.getenv("DB_USER")
+    DB_HOST: str = os.getenv("DB_HOST")
+    DB_NAME: str = os.getenv("DB_NAME")
+    DB_PORT: str = os.getenv("DB_PORT")
+    DB_PASSWORD: str = os.getenv("DB_PASSWORD")
 
-    # =============================================================================
-    # APPLICATION SETTINGS
-    # =============================================================================
-    APP_NAME: str = os.getenv("APP_NAME", "TroveSuite Auth Service")
-    DEBUG: bool = os.getenv("DEBUG", "False").lower() == "true"
-    
-    # =============================================================================
-    # SECURITY SETTINGS
-    # =============================================================================
-    ALGORITHM: str = os.getenv("ALGORITHM", "HS256")
-    SECRET_KEY: str = os.getenv("SECRET_KEY", "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7")
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "60"))
+    # Application settings
+    APP_NAME: str = os.getenv("APP_NAME", "Python Template API")
+    DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
+    APP_VERSION: str = os.getenv("APP_VERSION", "1.0.0")
     
-    # =============================================================================
-    # LOGGING SETTINGS
-    # =============================================================================
+    # Logging settings
     LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
     LOG_FORMAT: str = os.getenv("LOG_FORMAT", "detailed")  # detailed, json, simple
-    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() == "false"
+    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() in ("true", 1)
     LOG_MAX_SIZE: int = int(os.getenv("LOG_MAX_SIZE", "10485760"))  # 10MB
     LOG_BACKUP_COUNT: int = int(os.getenv("LOG_BACKUP_COUNT", "5"))
     LOG_DIR: str = os.getenv("LOG_DIR", "logs")
-
+        
+   # Security settings
+    ENVIRONMENT: str = os.getenv("ENVIRONMENT")
+    ALGORITHM: str = os.getenv("ALGORITHM")
+    SECRET_KEY: str = os.getenv("SECRET_KEY")
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "120"))
+    
     # =============================================================================
-    # DATABASE TABLE NAMES
+    # SHARED TABLES (main schema)
     # =============================================================================
-    # Main schema tables
-    MAIN_TENANTS_TABLE: str = os.getenv("MAIN_TENANTS_TABLE", "tenants")
-    ROLE_PERMISSIONS_TABLE: str = os.getenv("ROLE_PERMISSIONS_TABLE", "role_permissions")
-    
-    # Tenant-specific tables (used in queries with tenant schema)
-    TENANT_LOGIN_SETTINGS_TABLE: str = os.getenv("TENANT_LOGIN_SETTINGS_TABLE", "login_settings")
-    USER_GROUPS_TABLE: str = os.getenv("USER_GROUPS_TABLE", "user_groups")
-    ASSIGN_ROLES_TABLE: str = os.getenv("ASSIGN_ROLES_TABLE", "assign_roles")
+    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")
 
     # =============================================================================
-    # AZURE CONFIGURATION (Optional - for queue functionality)
+    # TENANT-SPECIFIC TABLES (tenant schemas)
     # =============================================================================
-    STORAGE_ACCOUNT_NAME: str = os.getenv("STORAGE_ACCOUNT_NAME", "")
-    USER_ASSIGNED_MANAGED_IDENTITY: str = os.getenv("USER_ASSIGNED_MANAGED_IDENTITY", "")
-    
+    TENANT_LOGIN_SETTINGS_TABLE = os.getenv("TENANT_LOGIN_SETTINGS_TABLE")
+    TENANT_ASSIGN_ROLES_TABLE = os.getenv("TENANT_ASSIGN_ROLES_TABLE")
+    TENANT_USER_GROUPS_TABLE = os.getenv("TENANT_USER_GROUPS_TABLE")
+
     @property
     def database_url(self) -> str:
-        """Get the database URL, either from DATABASE_URL or constructed from individual components"""
-        if self.DATABASE_URL != "postgresql://username:password@localhost:5432/database_name":
+        if self.DATABASE_URL:
             return self.DATABASE_URL
-        
-        # Validate individual components
-        if not all([self.DB_USER, self.DB_HOST, self.DB_NAME, self.DB_PASSWORD]):
-            missing = []
-            if not self.DB_USER:
-                missing.append("DB_USER")
-            if not self.DB_HOST:
-                missing.append("DB_HOST")
-            if not self.DB_NAME:
-                missing.append("DB_NAME")
-            if not self.DB_PASSWORD:
-                missing.append("DB_PASSWORD")
-            
-            raise ValueError(
-                f"Database configuration incomplete. Missing environment variables: {', '.join(missing)}. "
-                f"Please set these variables or provide a complete DATABASE_URL."
-            )
-        
-        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}"
-    
-    def validate_configuration(self) -> None:
-        """Validate the current configuration and warn about potential issues"""
-        warnings_list = []
-        
-        # Check for default secret key
-        if self.SECRET_KEY == "09d25e094faa6ca2556c818166b7a9563b93f7099f6f0f4caa6cf63b88e8d3e7":
-            warnings_list.append(
-                "SECRET_KEY is using the default value. This is insecure for production. "
-                "Please set a strong, unique SECRET_KEY environment variable."
-            )
-        
-        # Check for development environment in production-like settings
-        if self.ENVIRONMENT == "development" and self.DEBUG is False:
-            warnings_list.append(
-                "ENVIRONMENT is set to 'development' but DEBUG is False. "
-                "Consider setting ENVIRONMENT to 'production' for production deployments."
-            )
-        
-        # Check database configuration
-        try:
-            self.database_url
-        except ValueError as e:
-            warnings_list.append(f"Database configuration issue: {str(e)}")
-        
-        # Check for missing Azure configuration if needed
-        if self.ENVIRONMENT == "production" and not self.STORAGE_ACCOUNT_NAME:
-            warnings_list.append(
-                "STORAGE_ACCOUNT_NAME is not set. Azure queue functionality may not work properly."
-            )
-        
-        # Emit warnings
-        for warning in warnings_list:
-            warnings.warn(warning, UserWarning)
-    
-    def get_configuration_summary(self) -> dict:
-        """Get a summary of the current configuration (excluding sensitive data)"""
-        return {
-            "app_name": self.APP_NAME,
-            "environment": self.ENVIRONMENT,
-            "debug": self.DEBUG,
-            "database_host": self.DB_HOST,
-            "database_port": self.DB_PORT,
-            "database_name": self.DB_NAME,
-            "database_user": self.DB_USER,
-            "log_level": self.LOG_LEVEL,
-            "log_format": self.LOG_FORMAT,
-            "log_to_file": self.LOG_TO_FILE,
-            "algorithm": self.ALGORITHM,
-            "access_token_expire_minutes": self.ACCESS_TOKEN_EXPIRE_MINUTES,
-            "MAIN_TENANTS_TABLE": self.MAIN_TENANTS_TABLE,
-            "role_permissions_table": self.ROLE_PERMISSIONS_TABLE,
-            "TENANT_LOGIN_SETTINGS_TABLE": self.TENANT_LOGIN_SETTINGS_TABLE,
-            "user_groups_table": self.USER_GROUPS_TABLE,
-            "assign_roles_table": self.ASSIGN_ROLES_TABLE,
-        }
 
-# Global settings instance
-db_settings = Settings()
+        port = int(self.DB_PORT) if self.DB_PORT else 5432
+        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{port}/{self.DB_NAME}"
 
-# Validate configuration on import
-try:
-    db_settings.validate_configuration()
-except Exception as e:
-    warnings.warn("Configuration validation failed: %s", str(e), UserWarning)
+# Global settings instance
+db_settings = Settings()

{trovesuite-1.0.2.dist-info → trovesuite-1.0.3.dist-info}/METADATA

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

{trovesuite-1.0.2.dist-info → trovesuite-1.0.3.dist-info}/RECORD

@@ -3,19 +3,19 @@ trovesuite/auth/__init__.py,sha256=d8d5POjq9lGe7GVbc7Qm6hUpx1bgLqEVQFG1iYafdxI,3
 trovesuite/auth/auth_base.py,sha256=rZHQVLeJRBQ8GClgF5UwG-er4_HXVX5-nt8o6_Z29uY,75
 trovesuite/auth/auth_controller.py,sha256=47LsxPvE2wCqpadLPf_m68M8eR7Zu9HxfSSxZQZKQyM,412
 trovesuite/auth/auth_read_dto.py,sha256=3gSyz6YrdXvH6yPSPnqDpOmccWnSY-oH_c7izX96_LA,578
-trovesuite/auth/auth_service.py,sha256=ZsR6LXE6c0ej4U8rb5SdccL6cyk2t_LicIESe98sUE8,14260
+trovesuite/auth/auth_service.py,sha256=hz76IhwFG9T9YIivJt70Ao0ywEgHRrB0yly7Rr8uOv8,14286
 trovesuite/auth/auth_write_dto.py,sha256=TkZw78-XNSr5Gy4sCl6DBs1CFsX2V2yMttpSQiXsDqE,231
 trovesuite/configs/__init__.py,sha256=h1mSZOaZ3kUy1ZMO_m9O9KklsxywM0RfMVZLh9h9WvQ,328
 trovesuite/configs/database.py,sha256=tXj-AYIUs-gjYrgioTnQafbDhsaIsgimWWLXR3ru-1A,7580
 trovesuite/configs/logging.py,sha256=mGjR2d4urVNry9l5_aXycMMtcY2RAFIpEL35hw33KZg,9308
-trovesuite/configs/settings.py,sha256=7Z9b-yWLSCL_NA28JfOGisQIrOvGb5PhcriQJvnZURk,7189
+trovesuite/configs/settings.py,sha256=yUbkiFi4QdO9JZG1RRFbP4tYurT47HmN-ohgYcs2SHM,2561
 trovesuite/entities/__init__.py,sha256=Dbl_03Bueyh2vOP2hykd40MmNMrl5nNHSRGP-kqwwNo,160
 trovesuite/entities/health.py,sha256=H8-XUywzvMfZy2dZwDyJGAUbmuULuZYvYIUWhiaVGdY,2729
 trovesuite/entities/sh_response.py,sha256=1_sw3PpVaDxWsNiBU0W9YLHZgTFxEj4JJBLBfSY63Ho,1579
 trovesuite/utils/__init__.py,sha256=3UPKTz9cluTgAM-ldNsJxsnoPTZiqacXlAmzUEHy6q8,143
 trovesuite/utils/helper.py,sha256=lvZ1mvaqY84dkIPB5Ov0uwYDOWBziAS8twobEJZh2Ik,1002
-trovesuite-1.0.2.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
-trovesuite-1.0.2.dist-info/METADATA,sha256=5x_ou9Ms1YB8QezQRUb4abYJPdlEuB96undblGhYnbQ,15925
-trovesuite-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-trovesuite-1.0.2.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
-trovesuite-1.0.2.dist-info/RECORD,,
+trovesuite-1.0.3.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
+trovesuite-1.0.3.dist-info/METADATA,sha256=ytVHnT7Y477a_2vvdMx3Lb9dC-dFPwsv2ptN_0HW1uM,15925
+trovesuite-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+trovesuite-1.0.3.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
+trovesuite-1.0.3.dist-info/RECORD,,