eclinical-requester 1.0.12__tar.gz → 1.0.14__tar.gz

{eclinical_requester-1.0.12/src/eclinical_requester.egg-info → eclinical_requester-1.0.14}/PKG-INFO

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

{eclinical_requester-1.0.12 → eclinical_requester-1.0.14}/src/api_requester/__init__.py

@@ -6,4 +6,4 @@
 @Description: Description
 @File: __init__.py.py
 """
-__version__ = "1.0.12"
+__version__ = "1.0.14"

{eclinical_requester-1.0.12 → eclinical_requester-1.0.14}/src/api_requester/http/authorize_ediary.py

@@ -46,7 +46,7 @@ class AuthorizeEdiary(BizBase, AdminSubjectAuthService, CommonSubjectAuthService
         self.time_mills = time.time()
         encrypt_pwd = encrypt_password(self.user.password)
         jwt_authentication_request_dto = SubjectJwtAuthenticationRequest(
-            self.user.username, encrypt_pwd, self.user.org_code)
+            self.user.username, encrypt_pwd, organizationCode=self.user.org_code or None)
         response = self.auth_subject_login(jwt_authentication_request_dto)
         if response is None:
             raise Exception(f"LoginParams failed: {response}")

eclinical_requester-1.0.14/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.12 → eclinical_requester-1.0.14/src/eclinical_requester.egg-info}/PKG-INFO

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

{eclinical_requester-1.0.12 → eclinical_requester-1.0.14}/src/eclinical_requester.egg-info/SOURCES.txt

@@ -55,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.12 → eclinical_requester-1.0.14}/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):
@@ -41,3 +43,20 @@ class TestApiRequester(unittest.TestCase):
         c.login()
         response = c.request("get", "/study/information")
         assert response.json().get("payload").get("name") == "Study-113-963"
+
+    @staticmethod
+    def test_ediary_login_with_no_org_code():
+        c = ApiRequester("76548847", "340196", app=AppEnum.EDC.code, test_env="dev01", ttype=EdcAppType.EDIARY.name, org_code="")
+        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))