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

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

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

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

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

{eclinical_requester-1.0.13 → eclinical_requester-1.0.15}/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, org_code=None):
+                 company=None, role=None, external=False, ttype=None, org_code=None, token=None):
         u = EClinicalUser(
             username=username,
             password=password,
@@ -35,6 +35,7 @@ class ApiRequester(BizBase):
             role=role,
             external=external,
             org_code=org_code,
+            token=token,
         )
         super().__init__(u)
         self.headers = dict()

{eclinical_requester-1.0.13 → eclinical_requester-1.0.15}/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, org_code=None):
+                 company=None, role=None, external=False, org_code=None, token=None):
         # username 用户名
         # password 密码
         # app 访问的系统
@@ -30,6 +30,7 @@ class EClinicalUser:
         self.external = external
         self.company_level_login = False
         self.org_code = org_code
+        self.token = token  # 使用token直接调用接口
 
     def __repr__(self):
         attributes = self.__dict__

{eclinical_requester-1.0.13 → eclinical_requester-1.0.15}/src/api_requester/http/authorize.py

@@ -38,6 +38,11 @@ class Authorize(BizBase, AdminAuthService, AdminUserOnBoardApplicationServiceImp
         CommonSystemEnvServiceImpl.__init__(self)
 
     def login(self):
+        if self.user.token:
+            self.headers = SampleHeaders().add_authorization(self.user.token).to_h()
+            self.time_mills = time.time()
+            self.user.app = self.login_app
+            return
         if self.login_app == AppEnum.CODING.code:
             login_app_tip = "{0}({1})".format(self.login_app,
                                               self.user.company_level_login is True and "admin" or "study")

{eclinical_requester-1.0.13 → eclinical_requester-1.0.15}/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, organizationCode=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.13 → eclinical_requester-1.0.15/src/eclinical_requester.egg-info}/PKG-INFO

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

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

@@ -44,6 +44,14 @@ class TestApiRequester(unittest.TestCase):
         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,
@@ -52,4 +60,13 @@ class TestApiRequester(unittest.TestCase):
         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))
+        print(json.loads(node))
+
+    @staticmethod
+    def test_get_by_token():
+        c = ApiRequester(app=AppEnum.DESIGN.code, test_env="dev03",
+                         token="DESIGN eyJhbGciOiJIUzUxMiJ9.eyJ1aWQiOiI4MzM4OTYxZjgzMzc0OWU3YTQwMzcxYWU2MjNjYjk0ZCIsInN1YiI6IlVzZXJ8fENSQzAxfHwxfHwwIiwid2lkIjoiNDdkNmY0NzI3ZTgzNDRmOWJkYjNjOWZiNDc5MmMwYWEiLCJjcmVhdGVkIjoxNzUzNDI5MjIxOTk0LCJleHAiOjE3NjEyMDUyMjF9.GmTtnjobE8RByKBjrRfj8nxjXNgevpmcHRPCRkFD7OEjcdZSW69fX3VBSlSgSXtHAQrdaEPr5W0n6EefNngKWQ")
+        c.login()
+        response = c.request("GET", "/study")
+        payload = response.json().get("payload")
+        print(payload)