eclinical-requester 1.0.11__py3-none-any.whl → 1.0.12__py3-none-any.whl

api_requester/__init__.py

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

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): ...

api_requester/core/admin/dto/jwt_authentication_request.py

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

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

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))

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()

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)

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, 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.11.dist-info → eclinical_requester-1.0.12.dist-info}/METADATA

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

{eclinical_requester-1.0.11.dist-info → eclinical_requester-1.0.12.dist-info}/RECORD

@@ -1,23 +1,24 @@
-api_requester/__init__.py,sha256=-AufKHQP-o4XT_zMkWKvoiqeJNt021Kbcw0hS2sf_-U,176
+api_requester/__init__.py,sha256=UcDSkXtvZ8HYHela-2dnWRnKQX2IgZcQlQwcK_0maEA,176
 api_requester/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/core/call_api.py,sha256=a756aZbaG42MWj-VLHJpfWJ5zvBpA615HDogQCdnEUw,2717
+api_requester/core/call_api.py,sha256=iygayWh223Ru0vdrFueLD1UjmU2ZneDULW3oppdUSDA,2765
 api_requester/core/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/api/auth_api.py,sha256=dKKOuEnXIKgzhUfaNfSzNm24LREUcvPZ28xxTZisY6w,861
 api_requester/core/admin/api/ecoa_auth_api.py,sha256=kbDB-3dbVEs_XMe95yUNJHLpe0hZCmpIvycATajJCxE,1008
-api_requester/core/admin/api/subject_auth_api.py,sha256=QQHIrFfuSy9hTOO4Zo1K1rBtvFO-qF4iJH9JiUuPpoM,640
+api_requester/core/admin/api/subject_auth_api.py,sha256=NAWm8TVkn4ZZwYSDQGEKzClUCJib3DxxG3pYnKfFPv0,760
 api_requester/core/admin/api/user_on_board_application_api.py,sha256=gb7w8NYWsXgnWOla9JMyAyb5gVz3NmLiEb9H7ZlkyQs,897
 api_requester/core/admin/dto/__init__.py,sha256=qzyXEU5lClt3eyhOuVr-XxwcB6XR4I_1Ez26ioFLuV4,153
 api_requester/core/admin/dto/cross_user_user_on_board_dto.py,sha256=VSsihBthlfJORhhVeumDQxuF0lUj5vsLUcF3131Wi1s,489
 api_requester/core/admin/dto/ecoa_onboard_request_dto.py,sha256=SL1NDa1wtvhfJqLvbnmDD-HyR0vKGtoUUybSYiZ7jT8,498
-api_requester/core/admin/dto/jwt_authentication_request.py,sha256=Wo9xTzpVIUJjkr4nYdnXsB7Q2nu3oFpy36K2aUUSy90,472
+api_requester/core/admin/dto/jwt_authentication_request.py,sha256=KQCe8nJSsmpldilUbU0MZ1V_A2ZUpv7hm4HE8-rUO7I,498
 api_requester/core/admin/dto/reset_password_email_request_dto.py,sha256=5n6LYwGxibmmtAbrLSrokd2FHWGk6w4pV0bQ31BFWII,476
 api_requester/core/admin/dto/sso_token_retrieve_dto.py,sha256=kvdUik1Pvar2AlI_o0i62KnTCkxqZNqk1tHORXeOmI0,452
+api_requester/core/admin/dto/subject_jwt_authentication_request.py,sha256=dmZ_nizt-gGfoUXqdRvImGn4EPMvLhQl82MaAHuvl7A,560
 api_requester/core/admin/dto/user_on_board_dto.py,sha256=zsCKgnEttnsCkFlXKfuzkXWbvIhfiWv3jEj8jY6GRbQ,692
 api_requester/core/admin/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/service/auth_service.py,sha256=foo5XJyDNcg9W9bigcjhKxhVNwUA4LKykOqir_ZfPq4,1062
 api_requester/core/admin/service/ecoa_auth_service.py,sha256=elwTj49MY-5Dgh6XNstbtmH-Cwh2-ykxE_y_z8Gd41I,1731
-api_requester/core/admin/service/subject_auth_service.py,sha256=PCvl2zmKwMOS0zbJEmI6QUZhHKr7cGSYqkxxnXGPsyA,911
+api_requester/core/admin/service/subject_auth_service.py,sha256=Iu5V-XymJk68oHCY3DapOWqYt3Qp2tGksPgAttbRYug,1200
 api_requester/core/admin/service/user_on_board_application_service.py,sha256=gh3-sQU9JkH_10QQ4vbejqGlFQr9u5oNgHbiQ7ulKcU,1363
 api_requester/core/admin/service/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/service/impl/system_env_service_impl.py,sha256=cWea0iOpUivR3bpiyQNE_1aQKtr2_5_xN9sABV6TBUs,1502
@@ -36,12 +37,12 @@ api_requester/docs/application.yaml,sha256=_yTaHYLd9CdGfM4ua3qbYOO3x36cWjFEcJmPG
 api_requester/dto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/dto/base_dto.py,sha256=nyBGidUblKE6MSK-yvcVSlYDyqPbIEdXiTOvymcFZp0,6904
 api_requester/dto/biz_base.py,sha256=4lzf6FoXCNBr0OlxbFryf-7v16wfP3Hv6c7WUh-DgNs,874
-api_requester/dto/user.py,sha256=zY3vPS-xaKyFzstig55kwmyfPUuMm5vKRhQQKLDTKf0,1299
+api_requester/dto/user.py,sha256=SaEBTfm56K-zAKfjABuEI_Ae0bdZP4UIVaBLrrBGVf4,1373
 api_requester/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/http/app_url.py,sha256=jTGwxPcu_yts4WZbE9wDl6HqGOB48BdEIGw4Otmo1F0,939
 api_requester/http/authorize.py,sha256=NEGPWmTwIlCK8ClCNXVrkajvz2utJEHiQbVrDVzF6p8,7608
 api_requester/http/authorize_ecoa.py,sha256=7KPjkCLp4xjMFybT66GSqhIeelGtn2sP-DokydBuQiI,3940
-api_requester/http/authorize_ediary.py,sha256=o-4PFHuI--HLLAq1df-12QBVavWVITUVVE3TWGlEdAA,2854
+api_requester/http/authorize_ediary.py,sha256=useGPV_SDAv_fDbU9KJgW4eT_rMQxzwplbsIZ3wXeKI,2910
 api_requester/http/eclinical_requests.py,sha256=JUQ7EPeAvspz-J6GvpoVM2kA4hyGN4AP166hyQlmeFM,9640
 api_requester/http/exceptions.py,sha256=BG0eSOkYT50Qib_PpjSrNWkcv9p9gBanOvXOWrP7Jz8,2685
 api_requester/http/gateway.py,sha256=Ntnj-3OtyKLoGpkcCczMWQ0-0XrS5J_qkEcc9jB5AUk,3676
@@ -57,8 +58,8 @@ api_requester/utils/placeholder_replacer.py,sha256=umNGeA1KCQ6Ewzsv1xEehLmHtKkgv
 api_requester/utils/read_file.py,sha256=M4oskAPDzefeVXfhhNmLe4GOjBKNi9WJLF4k474CTlo,2304
 api_requester/utils/rsa.py,sha256=dr2m3a2M_LYu1Us97EEiMcjZAkpn1yWKIOjyYYubZeg,1202
 api_requester/utils/time_utils.py,sha256=u1hHO0POBhdXaTQ7VGY_2YjaYxwlrWXGb5phP8iLfOY,579
-eclinical_requester-1.0.11.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.11.dist-info/METADATA,sha256=jjUSJWXe9GyIrcZKbIcLojJgy7LzfQJ7ol5Ql-RzUZ4,719
-eclinical_requester-1.0.11.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-eclinical_requester-1.0.11.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.11.dist-info/RECORD,,
+eclinical_requester-1.0.12.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+eclinical_requester-1.0.12.dist-info/METADATA,sha256=L79gJj9qu3-hyILQ9oghD1OQ6iOcAPFSzgPH9B5XinU,719
+eclinical_requester-1.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eclinical_requester-1.0.12.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
+eclinical_requester-1.0.12.dist-info/RECORD,,

{eclinical_requester-1.0.11.dist-info → eclinical_requester-1.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any