trovesuite 1.0.11__tar.gz → 1.0.12__tar.gz

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

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

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

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

@@ -77,7 +77,7 @@ class AuthService:
             )
 
             if not is_tenant_verified or len(is_tenant_verified) == 0:
-                logger.warning("Login failed - tenant not found: %s", tenant_id)
+                logger.warning("Authorization failed - tenant not found: %s", tenant_id)
                 return Respons[AuthServiceReadDto](
                     detail=f"Tenant '{tenant_id}' not found or has been deleted",
                     data=[],
@@ -87,7 +87,7 @@ class AuthService:
                 )
 
             if not is_tenant_verified[0]['is_verified']:
-                logger.warning("Login failed - tenant not verified for user: %s, tenant: %s", user_id, tenant_id)
+                logger.warning("Authorization failed - tenant not verified for user: %s, tenant: %s", user_id, tenant_id)
                 return Respons[AuthServiceReadDto](
                     detail=f"Tenant '{tenant_id}' is not verified. Please contact your administrator.",
                     data=[],
@@ -146,35 +146,54 @@ class AuthService:
                     error="USER_SUSPENDED"
                 )
 
+            # ✅ UPDATED: Mutually exclusive login restrictions logic
             if not login_settings_details[0]['can_always_login']:
-                current_day = datetime.now().strftime("%A").upper()
+                # Get from database (should already be datetime objects)
+                login_on = login_settings_details[0]['login_on']
+                logout_on = login_settings_details[0]['logout_on']
+                working_days = login_settings_details[0]['working_days']
 
-                if current_day not in login_settings_details[0]['working_days']:
-                    logger.warning("Authorization failed - outside working days for user: %s checking custom login period", user_id)
+                # Only ONE restriction type can be active at a time:
+                # 1. working_days restriction (if login_on/logout_on are NULL)
+                # 2. time period restriction (if login_on/logout_on are set)
 
-                    # Get current datetime (full date and time) with timezone
-                    current_datetime = datetime.now(timezone.utc).replace(microsecond=0, second=0)
-
-                    # Get from database (should already be datetime objects)
-                    login_on = login_settings_details[0]['login_on']
-                    logout_on = login_settings_details[0]['logout_on']
+                if login_on and logout_on:
+                    # Time period restriction is active
+                    logger.info(f"Checking time period restriction for user: {user_id}")
 
-                    # Set defaults if None (with timezone awareness)
-                    if not login_on:
-                        login_on = datetime.min.replace(tzinfo=timezone.utc)
-                    if not logout_on:
-                        logout_on = datetime.max.replace(tzinfo=timezone.utc)
+                    # Get current datetime (full date and time) with timezone
+                    current_datetime = datetime.now(timezone.utc).replace(
+                        microsecond=0, second=0
+                    )
 
                     # Compare full datetime objects (both date and time)
                     if not (login_on <= current_datetime <= logout_on):
-                        logger.warning("Authorization failed - outside allowed period for user: %s", user_id)
+                        logger.warning(
+                            f"Authorization failed - outside allowed period for user: {user_id}"
+                        )
                         return Respons[AuthServiceReadDto](
-                            detail="Login is not allowed at this time. Please check your access schedule.",
+                            detail="Access is not allowed at this time. Please check your access schedule.",
                             data=[],
                             success=False,
                             status_code=403,
                             error="LOGIN_TIME_RESTRICTED"
                         )
+                elif working_days:
+                    # Working days restriction is active
+                    logger.info(f"Checking working days restriction for user: {user_id}")
+                    current_day = datetime.now().strftime("%A").upper()
+
+                    if current_day not in working_days:
+                        logger.warning(
+                            f"Authorization failed - not a working day for user: {user_id}"
+                        )
+                        return Respons[AuthServiceReadDto](
+                            detail="Access is not allowed on this day. Please contact your administrator.",
+                            data=[],
+                            success=False,
+                            status_code=403,
+                            error="LOGIN_DAY_RESTRICTED"
+                        )
 
             # 4️⃣ Build query dynamically to include groups (if any) + user
             # ⚠️ CHANGED: Simplified to new schema - only select user_id, group_id, role_id, resource_type

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

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