eclinical-requester 1.0.11__tar.gz → 1.0.13__tar.gz

{eclinical_requester-1.0.11/src/eclinical_requester.egg-info → eclinical_requester-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eclinical_requester
-Version: 1.0.11
+Version: 1.0.13
 Summary: edetek api requester
 Home-page: http://example.com
 Author: xiaodong.li

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/setup.py

@@ -7,16 +7,12 @@
 @File: setup.py
 """
 
-import re
-
 import setuptools
-from src.api_requester import __version__
 from setuptools import find_packages
 
+from src.api_requester import __version__
+
 version = __version__
-# with open('src/api_requester/__init__.py', 'r') as fd:
-#     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
-#                         fd.read(), re.MULTILINE).group(1)
 
 with open("README.md", "r") as fh:
     long_description = fh.read()

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/__init__.py

@@ -6,4 +6,4 @@
 @Description: Description
 @File: __init__.py.py
 """
-__version__ = "1.0.11"
+__version__ = "1.0.13"

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/core/admin/api/subject_auth_api.py

@@ -22,3 +22,6 @@ class AdminSubjectAuthApi:
 
     @get('/auth/subject/me')
     def auth_subject_me_api(self, *args, **kwargs): ...
+
+    @get('/auth/subject/verify/organization-code')
+    def verify_organization_code_api(self, *args, **kwargs): ...

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/core/admin/dto/jwt_authentication_request.py

@@ -18,3 +18,4 @@ class JwtAuthenticationRequest(BaseDto):
     """
     userName: str
     password: str
+    mfaToken: str = None

eclinical_requester-1.0.13/src/api_requester/core/admin/dto/subject_jwt_authentication_request.py

@@ -0,0 +1,19 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2025/07/04 09:01
+@Description: Description
+@File: subject_jwt_authentication_request.py
+"""
+from dataclasses import dataclass
+
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+
+
+@dataclass
+class SubjectJwtAuthenticationRequest(JwtAuthenticationRequest):
+    """
+    The SubjectJwtAuthenticationRequest was generated by Generator from the SubjectJwtAuthenticationRequest.java file.
+    """
+    organizationCode: str = None

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/core/admin/service/subject_auth_service.py

@@ -8,6 +8,7 @@
 """
 from api_requester.core.admin.api.subject_auth_api import AdminSubjectAuthApi
 from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.subject_jwt_authentication_request import SubjectJwtAuthenticationRequest
 
 
 class AdminSubjectAuthService(AdminSubjectAuthApi):
@@ -18,7 +19,7 @@ class AdminSubjectAuthService(AdminSubjectAuthApi):
     def __init__(self):
         AdminSubjectAuthApi.__init__(self)
 
-    def auth_subject_login(self, authentication_request: JwtAuthenticationRequest = None):
+    def auth_subject_login(self, authentication_request: SubjectJwtAuthenticationRequest = None):
         return self.auth_subject_login_api(json=authentication_request)
 
     def auth_subject_logout(self):
@@ -26,3 +27,6 @@ class AdminSubjectAuthService(AdminSubjectAuthApi):
 
     def auth_subject_me(self):
         return self.auth_subject_me_api()
+
+    def verify_organization_code(self, organization_code: str = None):
+        return self.verify_organization_code_api(params=dict(organizationCode=organization_code))

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/core/call_api.py

@@ -22,7 +22,7 @@ from api_requester.utils.placeholder_replacer import PlaceholderReplacer
 class ApiRequester(BizBase):
 
     def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
-                 company=None, role=None, external=False, ttype=None):
+                 company=None, role=None, external=False, ttype=None, org_code=None):
         u = EClinicalUser(
             username=username,
             password=password,
@@ -33,7 +33,8 @@ class ApiRequester(BizBase):
             app=app,
             company=company,
             role=role,
-            external=external
+            external=external,
+            org_code=org_code,
         )
         super().__init__(u)
         self.headers = dict()

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/dto/user.py

@@ -11,7 +11,7 @@
 class EClinicalUser:
 
     def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
-                 company=None, role=None, external=False):
+                 company=None, role=None, external=False, org_code=None):
         # username 用户名
         # password 密码
         # app 访问的系统
@@ -29,11 +29,13 @@ class EClinicalUser:
         self.role = role
         self.external = external
         self.company_level_login = False
+        self.org_code = org_code
 
     def __repr__(self):
         attributes = self.__dict__
         info = [
-            str(attributes[item]) for item in ["test_env", "username", "role", "company", "sponsor", "study", "app_env"]
+            str(attributes[item]) for item in
+            ["test_env", "username", "role", "company", "sponsor", "study", "app_env", "org_code"]
             if attributes.get(item) is not None
         ]
         return "/".join(info)

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/api_requester/http/authorize_ediary.py

@@ -10,7 +10,7 @@ import time
 
 from loguru import logger
 
-from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.subject_jwt_authentication_request import SubjectJwtAuthenticationRequest
 from api_requester.core.admin.dto.user_on_board_dto import UserOnBoardDto
 from api_requester.core.admin.service.subject_auth_service import AdminSubjectAuthService
 from api_requester.core.common.service.subject_auth_service import CommonSubjectAuthService
@@ -45,7 +45,8 @@ class AuthorizeEdiary(BizBase, AdminSubjectAuthService, CommonSubjectAuthService
     def _auth(self):
         self.time_mills = time.time()
         encrypt_pwd = encrypt_password(self.user.password)
-        jwt_authentication_request_dto = JwtAuthenticationRequest(self.user.username, encrypt_pwd)
+        jwt_authentication_request_dto = SubjectJwtAuthenticationRequest(
+            self.user.username, encrypt_pwd, organizationCode=self.user.org_code)
         response = self.auth_subject_login(jwt_authentication_request_dto)
         if response is None:
             raise Exception(f"LoginParams failed: {response}")

eclinical_requester-1.0.13/src/api_requester/utils/decrypt.py

@@ -0,0 +1,40 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 5/22/2025 4:57 PM
+@Description: Description
+@File: decrypt.py
+"""
+import base64
+import re
+
+from Crypto.Cipher import AES
+
+
+def decrypt(str_base64: str, is_no_padding: bool = False) -> str:
+    key = b'1234567890123456'
+    iv = b'1234567890123456'
+
+    # Base64 解码
+    ciphertext = base64.b64decode(str_base64)
+
+    # 创建 AES 解密器
+    mode = AES.MODE_CBC
+    cipher = AES.new(key, mode, iv=iv)
+
+    # 解密
+    decrypted = cipher.decrypt(ciphertext)
+
+    if not is_no_padding:
+        # 去除 PKCS#7 padding
+        pad_len = decrypted[-1]
+        decrypted = decrypted[:-pad_len]
+
+    # 转成字符串（UTF-8 解码）
+    decrypted_str = decrypted.decode('utf-8', errors='replace')
+
+    # 替换不可见字符（与 JS 中 replace(/[\u0000-\u001F\u007F-\u009F]/g, ' ') 等效）
+    cleaned_str = re.sub(r'[\x00-\x1F\x7F-\x9F]', ' ', decrypted_str)
+
+    return cleaned_str

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13/src/eclinical_requester.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eclinical_requester
-Version: 1.0.11
+Version: 1.0.13
 Summary: edetek api requester
 Home-page: http://example.com
 Author: xiaodong.li

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/src/eclinical_requester.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ src/api_requester/core/admin/dto/ecoa_onboard_request_dto.py
 src/api_requester/core/admin/dto/jwt_authentication_request.py
 src/api_requester/core/admin/dto/reset_password_email_request_dto.py
 src/api_requester/core/admin/dto/sso_token_retrieve_dto.py
+src/api_requester/core/admin/dto/subject_jwt_authentication_request.py
 src/api_requester/core/admin/dto/user_on_board_dto.py
 src/api_requester/core/admin/service/__init__.py
 src/api_requester/core/admin/service/auth_service.py
@@ -54,6 +55,7 @@ src/api_requester/http/sample_headers.py
 src/api_requester/http/token_manager.py
 src/api_requester/utils/__init__.py
 src/api_requester/utils/constant.py
+src/api_requester/utils/decrypt.py
 src/api_requester/utils/json_utils.py
 src/api_requester/utils/lib.py
 src/api_requester/utils/logger.py

{eclinical_requester-1.0.11 → eclinical_requester-1.0.13}/tests/test_api_requester.py

@@ -6,10 +6,12 @@
 @Description: Description
 @File: test_api_requester.py
 """
+import json
 import unittest
 
 from api_requester.core.call_api import ApiRequester
 from api_requester.utils.constant import AppEnum, EdcAppType
+from api_requester.utils.decrypt import decrypt
 
 
 class TestApiRequester(unittest.TestCase):
@@ -33,3 +35,21 @@ class TestApiRequester(unittest.TestCase):
         c.login()
         response = c.request("get", "/study/information")
         assert response.json().get("payload").get("name") == "CRN04894-13"
+
+    @staticmethod
+    def test_ediary_login_with_org_code():
+        c = ApiRequester("76548847", "340196", app=AppEnum.EDC.code, test_env="dev01", ttype=EdcAppType.EDIARY.name,
+                         org_code="62B64A")
+        c.login()
+        response = c.request("get", "/study/information")
+        assert response.json().get("payload").get("name") == "Study-113-963"
+
+    @staticmethod
+    def test_ediary_data_with_org_code():
+        c = ApiRequester("76548847", "340196", app=AppEnum.EDC.code, test_env="dev01", ttype=EdcAppType.EDIARY.name,
+                         org_code="62B64A")
+        c.login()
+        response = c.request("post", "/e-diary-app/offline/subject-version")
+        payload = response.json().get("payload")
+        node = decrypt(payload, is_no_padding=True)
+        print(json.loads(node))