eclinical-requester 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

api_requester/__init__.py

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

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

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__

api_requester/http/authorize.py

@@ -38,6 +38,12 @@ 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
+            self.get_current_system_env()
+            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.14.dist-info → eclinical_requester-1.0.16.dist-info}/METADATA

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

{eclinical_requester-1.0.14.dist-info → eclinical_requester-1.0.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
-api_requester/__init__.py,sha256=6Ge9Z-M552pkA-tZPuxUdi3YUCKzdhthKFoxucaHTGA,176
+api_requester/__init__.py,sha256=UTKfs6PToJmMK2UkZAZrdNM09TMLDFY9uWCvv8WsdN0,176
 api_requester/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/core/call_api.py,sha256=iygayWh223Ru0vdrFueLD1UjmU2ZneDULW3oppdUSDA,2765
+api_requester/core/call_api.py,sha256=nu3AANRty6IVdilRaFGmFeKQijuw6mrCgzU0WzHCOck,2803
 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
@@ -37,10 +37,10 @@ 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=SaEBTfm56K-zAKfjABuEI_Ae0bdZP4UIVaBLrrBGVf4,1373
+api_requester/dto/user.py,sha256=M27az447jYRSMJScDzUrP4tUduI22SpGCMe-oZlDTN8,1446
 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.py,sha256=SVYT_iat85RfgR4VJ9dmVC3TnWH-QTxIgDmpz8PAp1s,7873
 api_requester/http/authorize_ecoa.py,sha256=7KPjkCLp4xjMFybT66GSqhIeelGtn2sP-DokydBuQiI,3940
 api_requester/http/authorize_ediary.py,sha256=zWNR-4Z8jg0ytYmoZJ9upFQIjKMCsv49Qp8gj846mBc,2935
 api_requester/http/eclinical_requests.py,sha256=JUQ7EPeAvspz-J6GvpoVM2kA4hyGN4AP166hyQlmeFM,9640
@@ -59,8 +59,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.14.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.14.dist-info/METADATA,sha256=UqOdJB_P86woNYay1IPstszBAwlCJv313mSkLzrAp2c,719
-eclinical_requester-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eclinical_requester-1.0.14.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.14.dist-info/RECORD,,
+eclinical_requester-1.0.16.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+eclinical_requester-1.0.16.dist-info/METADATA,sha256=fBMaYFA5ZL35usvG0rQOE7c2hJ-wAulctppX454Ra5Q,719
+eclinical_requester-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eclinical_requester-1.0.16.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
+eclinical_requester-1.0.16.dist-info/RECORD,,