trovesuite 1.0.13__py3-none-any.whl → 1.0.14__py3-none-any.whl

trovesuite/auth/auth_service.py

@@ -234,7 +234,6 @@ class AuthService:
                     FROM main.system_user_groups sug
                     INNER JOIN main.system_assign_roles 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'
                 """,
@@ -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.dist-info → trovesuite-1.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.13
+Version: 1.0.14
 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.dist-info → trovesuite-1.0.14.dist-info}/RECORD

@@ -3,7 +3,7 @@ trovesuite/auth/__init__.py,sha256=OjZllVvjul1glDazJ-d5TrNjgHFigFlQQi1G99DYshk,2
 trovesuite/auth/auth_base.py,sha256=rZHQVLeJRBQ8GClgF5UwG-er4_HXVX5-nt8o6_Z29uY,75
 trovesuite/auth/auth_controller.py,sha256=PAgaVlf5TYEfkSfK4vGGsvO84i8zEmeVVXyUF2YBppI,420
 trovesuite/auth/auth_read_dto.py,sha256=e27JqKVPVUM83A_mYF452QCflsvGNo7aKje7q_urwFc,571
-trovesuite/auth/auth_service.py,sha256=N5ax0rdGlHcu7cpJyAFrrwdkwKN8gsoh-t6ngIvXBAk,17548
+trovesuite/auth/auth_service.py,sha256=_noR3A4Ss7ioP6j--MvlN0EWvcjs5Nljpa3u9zHDooY,18044
 trovesuite/auth/auth_write_dto.py,sha256=rdwI7w6-9QZGv1H0PAGrjkLBCzaMHjgPIXeLb9RmNec,234
 trovesuite/configs/__init__.py,sha256=h1mSZOaZ3kUy1ZMO_m9O9KklsxywM0RfMVZLh9h9WvQ,328
 trovesuite/configs/database.py,sha256=IPSu8fXjxyYeJ3bFknJG06Qm2L2ub6Ht19xhKv8g7nA,11731
@@ -26,8 +26,8 @@ trovesuite/storage/storage_service.py,sha256=V7LIePIV6b_iuhm-9x8r4zwpZHgeRPL1YIe
 trovesuite/storage/storage_write_dto.py,sha256=vl1iCZ93bpFmpvkCrn587QtMtOA_TPDseXSoTuj9RTQ,1355
 trovesuite/utils/__init__.py,sha256=3UPKTz9cluTgAM-ldNsJxsnoPTZiqacXlAmzUEHy6q8,143
 trovesuite/utils/helper.py,sha256=lvZ1mvaqY84dkIPB5Ov0uwYDOWBziAS8twobEJZh2Ik,1002
-trovesuite-1.0.13.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
-trovesuite-1.0.13.dist-info/METADATA,sha256=V0DYYd8qAzusR_UKkg--F4scCYY0PhONHhjoa6fZ91k,21737
-trovesuite-1.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-trovesuite-1.0.13.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
-trovesuite-1.0.13.dist-info/RECORD,,
+trovesuite-1.0.14.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
+trovesuite-1.0.14.dist-info/METADATA,sha256=3A2HHGAEGEtZ1HTRflqCVmO6nhSewwiSrentaWVQSTQ,21737
+trovesuite-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+trovesuite-1.0.14.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
+trovesuite-1.0.14.dist-info/RECORD,,