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

api_requester/__init__.py

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

api_requester/core/admin/api/ecoa_auth_api.py

@@ -0,0 +1,36 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/08 14:20
+@Description: Description
+@File: ecoa_auth_api.py
+"""
+from api_requester.http.eclinical_requests import *
+
+
+class AdminEcoaAuthApi:
+    """
+    The AdminEcoaAuthApi was generated by Generator from the EcoaAuthController.java file.
+    """
+
+    @post('/auth/ecoa/login')
+    def auth_ecoa_login_api(self, *args, **kwargs): ...
+
+    @post('/auth/ecoa/login/sso')
+    def create_authentication_token_from_sso_api(self, *args, **kwargs): ...
+
+    @get('/auth/ecoa/logout')
+    def auth_ecoa_logout_api(self, *args, **kwargs): ...
+
+    @get('/auth/ecoa/me')
+    def auth_ecoa_me_api(self, *args, **kwargs): ...
+
+    @post('/auth/ecoa/reset_password')
+    def reset_password_email_api(self, *args, **kwargs): ...
+
+    @post('/auth/ecoa/study-list')
+    def ecoa_study_list_api(self, *args, **kwargs): ...
+
+    @post('/auth/ecoa/onboard')
+    def onboard_api(self, *args, **kwargs): ...

api_requester/core/admin/api/subject_auth_api.py

@@ -0,0 +1,24 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/04/24 20:45
+@Description: Description
+@File: subject_auth_api.py
+"""
+from api_requester.http.eclinical_requests import *
+
+
+class AdminSubjectAuthApi:
+    """
+    The AdminSubjectAuthApi was generated by Generator from the SubjectAuthController.java file.
+    """
+
+    @post('/auth/subject/login')
+    def auth_subject_login_api(self, *args, **kwargs): ...
+
+    @get('/auth/subject/logout')
+    def auth_subject_logout_api(self, *args, **kwargs): ...
+
+    @get('/auth/subject/me')
+    def auth_subject_me_api(self, *args, **kwargs): ...

api_requester/core/admin/dto/__init__.py

@@ -0,0 +1,8 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 5/15/2025 2:07 PM
+@Description: Description
+@File: __init__.py.py
+"""

api_requester/core/admin/dto/ecoa_onboard_request_dto.py

@@ -0,0 +1,21 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/08 14:20
+@Description: Description
+@File: ecoa_onboard_request_dto.py
+"""
+from dataclasses import dataclass
+
+from api_requester.dto.base_dto import BaseDto
+
+
+@dataclass
+class EcoaOnboardRequestDto(BaseDto):
+    """
+    The EcoaOnboardRequestDto was generated by Generator from the EcoaOnboardRequestDto.java file.
+    """
+    sponsorId: int = None
+    studyId: int = None
+    envId: int = None

api_requester/core/admin/dto/reset_password_email_request_dto.py

@@ -0,0 +1,19 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/04/24 20:45
+@Description: Description
+@File: reset_password_email_request_dto.py
+"""
+from dataclasses import dataclass
+
+from api_requester.dto.base_dto import BaseDto
+
+
+@dataclass
+class ResetPasswordEmailRequestDto(BaseDto):
+    """
+    The ResetPasswordEmailRequestDto was generated by Generator from the ResetPasswordEmailRequestDto.java file.
+    """
+    userId: str = None

api_requester/core/admin/dto/sso_token_retrieve_dto.py

@@ -0,0 +1,20 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/04/26 19:01
+@Description: Description
+@File: sso_token_retrieve_dto.py
+"""
+from dataclasses import dataclass
+
+from api_requester.dto.base_dto import BaseDto
+
+
+@dataclass
+class SsoTokenRetrieveDto(BaseDto):
+    """
+    The SsoTokenRetrieveDto was generated by Generator from the SsoTokenRetrieveDto.java file.
+    """
+    tokenId: str
+    userName: str

api_requester/core/admin/service/auth_service.py

@@ -7,7 +7,7 @@
 @File: auth_service.py
 """
 from api_requester.core.admin.api.auth_api import AdminAuthApi
-from api_requester.dto.admin.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
 
 
 class AdminAuthService(AdminAuthApi):

api_requester/core/admin/service/ecoa_auth_service.py

@@ -0,0 +1,43 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/08 14:20
+@Description: Description
+@File: ecoa_auth_service.py
+"""
+from api_requester.core.admin.api.ecoa_auth_api import AdminEcoaAuthApi
+from api_requester.core.admin.dto.ecoa_onboard_request_dto import EcoaOnboardRequestDto
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.reset_password_email_request_dto import ResetPasswordEmailRequestDto
+from api_requester.core.admin.dto.sso_token_retrieve_dto import SsoTokenRetrieveDto
+
+
+class AdminEcoaAuthService(AdminEcoaAuthApi):
+    """
+    The AdminEcoaAuthService was generated by Generator from the EcoaAuthController.java file.
+    """
+
+    def __init__(self):
+        AdminEcoaAuthApi.__init__(self)
+
+    def auth_ecoa_login(self, authentication_request: JwtAuthenticationRequest = None):
+        return self.auth_ecoa_login_api(json=authentication_request)
+
+    def create_authentication_token_from_sso(self, token_retrieve: SsoTokenRetrieveDto = None):
+        return self.create_authentication_token_from_sso_api(json=token_retrieve)
+
+    def auth_ecoa_logout(self):
+        return self.auth_ecoa_logout_api()
+
+    def auth_ecoa_me(self):
+        return self.auth_ecoa_me_api()
+
+    def reset_password_email(self, reset_password_email_request_dto: ResetPasswordEmailRequestDto = None):
+        return self.reset_password_email_api(json=reset_password_email_request_dto)
+
+    def ecoa_study_list(self):
+        return self.ecoa_study_list_api()
+
+    def onboard(self, ecoa_onboard_dto: EcoaOnboardRequestDto = None):
+        return self.onboard_api(json=ecoa_onboard_dto)

api_requester/core/admin/service/impl/system_env_service_impl.py

@@ -6,9 +6,10 @@
 @Description: Description
 @File: system_env_service_impl.py
 """
+from loguru import logger
+
 from api_requester.core.common.service.system_env_service import CommonSystemEnvService
 from api_requester.http.token_manager import apply_token_to_headers
-from api_requester.utils.log import Logger
 
 
 class CommonSystemEnvServiceImpl(CommonSystemEnvService):
@@ -35,5 +36,5 @@ class CommonSystemEnvServiceImpl(CommonSystemEnvService):
                 if onboard_role:
                     self.switch_env(env_id=item.get("id"), role_id=onboard_role.get("id"))
                     apply_token_to_headers(self)
-                    Logger().info(f"The user switches the {role} role successfully.")
+                    logger.info(f"The user switches the {role} role successfully.")
                     return

api_requester/core/admin/service/subject_auth_service.py

@@ -0,0 +1,28 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/09/06 14:41
+@Description: Description
+@File: subject_auth_service.py
+"""
+from api_requester.core.admin.api.subject_auth_api import AdminSubjectAuthApi
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+
+
+class AdminSubjectAuthService(AdminSubjectAuthApi):
+    """
+    The AdminSubjectAuthService was generated by Generator from the SubjectAuthController.java file.
+    """
+
+    def __init__(self):
+        AdminSubjectAuthApi.__init__(self)
+
+    def auth_subject_login(self, authentication_request: JwtAuthenticationRequest = None):
+        return self.auth_subject_login_api(json=authentication_request)
+
+    def auth_subject_logout(self):
+        return self.auth_subject_logout_api()
+
+    def auth_subject_me(self):
+        return self.auth_subject_me_api()

api_requester/core/admin/service/user_on_board_application_service.py

@@ -7,8 +7,8 @@
 @File: user_on_board_application_service.py
 """
 from api_requester.core.admin.api.user_on_board_application_api import AdminUserOnBoardApplicationApi
-from api_requester.dto.admin.cross_user_user_on_board_dto import CrossUserUserOnBoardDto
-from api_requester.dto.admin.user_on_board_dto import UserOnBoardDto
+from api_requester.core.admin.dto.cross_user_user_on_board_dto import CrossUserUserOnBoardDto
+from api_requester.core.admin.dto.user_on_board_dto import UserOnBoardDto
 
 
 class AdminUserOnBoardApplicationService(AdminUserOnBoardApplicationApi):

api_requester/core/call_api.py

@@ -8,18 +8,21 @@
 """
 from requests import request
 
-from api_requester.dto.admin.user_on_board_dto import UserOnBoardDto
+from api_requester.core.admin.dto.user_on_board_dto import UserOnBoardDto
 from api_requester.dto.biz_base import BizBase
 from api_requester.dto.user import EClinicalUser
 from api_requester.http.app_url import AppUrl
 from api_requester.http.authorize import Authorize
+from api_requester.http.authorize_ecoa import AuthorizeEcoa
+from api_requester.http.authorize_ediary import AuthorizeEdiary
+from api_requester.utils.constant import EdcAppType
 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):
+                 company=None, role=None, external=False, ttype=None):
         u = EClinicalUser(
             username=username,
             password=password,
@@ -35,9 +38,17 @@ class ApiRequester(BizBase):
         super().__init__(u)
         self.headers = dict()
         self.user_onboard_dto: UserOnBoardDto = UserOnBoardDto(-1)
+        self.ttype = ttype
 
     def login(self):
-        auth = Authorize(self.user)
+        auth = None
+        if isinstance(self.ttype, str):
+            if self.ttype.lower() == EdcAppType.ECOA.name.lower():
+                auth = AuthorizeEcoa(self.user)
+            elif self.ttype.lower() == EdcAppType.EDIARY.name.lower():
+                auth = AuthorizeEdiary(self.user)
+        if not auth:
+            auth = Authorize(self.user)
         auth.login()
         self.headers = auth.headers
         self.time_mills = auth.time_mills
@@ -49,7 +60,7 @@ class ApiRequester(BizBase):
             url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(api)
         else:
             url = AppUrl(self.user.app, self.user.test_env).external_url(api)
-        request(method, url, headers=self.headers, **kwargs)
+        return request(method, url, headers=self.headers, **kwargs)
 
     def user_replacer(self):
         return PlaceholderReplacer({

api_requester/core/common/api/ecoa_auth_api.py

@@ -0,0 +1,40 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/22 10:32
+@Description: Description
+@File: ecoa_auth_api.py
+"""
+from api_requester.http.eclinical_requests import *
+
+
+class CommonEcoaAuthApi:
+    """
+    The CommonEcoaAuthApi was generated by Generator from the EcoaAuthController.java file.
+    """
+    
+    @post('/ecoa/auth/login')
+    def create_authentication_token_api(self, *args, **kwargs): ...
+    
+    @get('/ecoa/refresh')
+    def refresh_and_get_authentication_token_api(self, *args, **kwargs): ...
+    
+    @get('/ecoa/auth/logout')
+    def logout_api(self, *args, **kwargs): ...
+    
+    @post('/ecoa/auth/all-study-logout')
+    def all_study_logout_api(self, *args, **kwargs): ...
+    
+    @get('/ecoa/me')
+    def me_api(self, *args, **kwargs): ...
+    
+    @get('/ecoa/name')
+    def ecoa_account_api(self, *args, **kwargs): ...
+    
+    @post('/ecoa/change-password')
+    def change_password_api(self, *args, **kwargs): ...
+    
+    @post('/ecoa/change-study-rel-language')
+    def change_study_language_api(self, *args, **kwargs): ...
+    

api_requester/core/common/api/subject_auth_api.py

@@ -0,0 +1,30 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/01 17:01
+@Description: Description
+@File: subject_auth_api.py
+"""
+from api_requester.http.eclinical_requests import *
+
+
+class CommonSubjectAuthApi:
+    """
+    The CommonSubjectAuthApi was generated by Generator from the SubjectAuthController.java file.
+    """
+
+    @post('/subject/auth/login')
+    def subject_auth_login_api(self, *args, **kwargs): ...
+
+    @get('/subject/refresh')
+    def subject_refresh_api(self, *args, **kwargs): ...
+
+    @get('/subject/auth/logout')
+    def subject_auth_logout_api(self, *args, **kwargs): ...
+
+    @get('/subject/me')
+    def subject_me_api(self, *args, **kwargs): ...
+
+    @get('/subject/name')
+    def subject_api(self, *args, **kwargs): ...

api_requester/core/common/dto/portal_login_t_ime.py

@@ -0,0 +1,19 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/22 10:32
+@Description: Description
+@File: portal_login_t_ime.py
+"""
+from dataclasses import dataclass
+
+from api_requester.dto.base_dto import BaseDto
+
+
+@dataclass
+class PortalLoginTIme(BaseDto):
+    """
+    The PortalLoginTIme was generated by Generator from the PortalLoginTIme.java file.
+    """
+    portalLoginTime: int = None

api_requester/core/common/service/ecoa_auth_service.py

@@ -0,0 +1,45 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/22 10:32
+@Description: Description
+@File: ecoa_auth_service.py
+"""
+from typing import List
+
+from api_requester.core.common.api.ecoa_auth_api import CommonEcoaAuthApi
+from api_requester.core.common.dto.portal_login_t_ime import PortalLoginTIme
+
+
+class CommonEcoaAuthService(CommonEcoaAuthApi):
+    """
+    The CommonEcoaAuthService was generated by Generator from the EcoaAuthController.java file.
+    """
+
+    def __init__(self):
+        CommonEcoaAuthApi.__init__(self)
+
+    def create_authentication_token(self, portal_login_time: PortalLoginTIme = None):
+        return self.create_authentication_token_api(json=portal_login_time)
+
+    def refresh_and_get_authentication_token(self):
+        return self.refresh_and_get_authentication_token_api()
+
+    def logout(self):
+        return self.logout_api()
+
+    def all_study_logout(self, tokens: List[str] = None):
+        return self.all_study_logout_api(json=tokens)
+
+    def me(self):
+        return self.me_api()
+
+    def ecoa_account(self):
+        return self.ecoa_account_api()
+
+    def change_password(self, ecoa_account_change_password_dto=None):
+        return self.change_password_api(json=ecoa_account_change_password_dto)
+
+    def change_study_language(self, language_id: int = None):
+        return self.change_study_language_api(params=dict(languageId=language_id))

api_requester/core/common/service/subject_auth_service.py

@@ -0,0 +1,33 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 2024/11/01 17:01
+@Description: Description
+@File: subject_auth_service.py
+"""
+from api_requester.core.common.api.subject_auth_api import CommonSubjectAuthApi
+
+
+class CommonSubjectAuthService(CommonSubjectAuthApi):
+    """
+    The CommonSubjectAuthService was generated by Generator from the SubjectAuthController.java file.
+    """
+
+    def __init__(self):
+        CommonSubjectAuthApi.__init__(self)
+
+    def subject_auth_login(self):
+        return self.subject_auth_login_api()
+
+    def subject_refresh(self):
+        return self.subject_refresh_api()
+
+    def subject_auth_logout(self):
+        return self.subject_auth_logout_api()
+
+    def subject_me(self):
+        return self.subject_me_api()
+
+    def subject(self):
+        return self.subject_api()

api_requester/http/authorize.py

@@ -8,18 +8,19 @@
 """
 import time
 
+from loguru import logger
+
+from api_requester.core.admin.dto.cross_user_user_on_board_dto import CrossUserUserOnBoardDto
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.user_on_board_dto import UserOnBoardDto
 from api_requester.core.admin.service.auth_service import AdminAuthService
 from api_requester.core.admin.service.impl.system_env_service_impl import CommonSystemEnvServiceImpl
 from api_requester.core.admin.service.impl.user_on_board_application_service_impl import \
     AdminUserOnBoardApplicationServiceImpl
-from api_requester.dto.admin.cross_user_user_on_board_dto import CrossUserUserOnBoardDto
-from api_requester.dto.admin.jwt_authentication_request import JwtAuthenticationRequest
-from api_requester.dto.admin.user_on_board_dto import UserOnBoardDto
 from api_requester.dto.biz_base import BizBase
 from api_requester.dto.user import EClinicalUser
 from api_requester.http.sample_headers import SampleHeaders
 from api_requester.utils.constant import AppEnum, UserType
-from api_requester.utils.log import Logger
 from api_requester.utils.rsa import encrypt_password
 
 
@@ -57,10 +58,10 @@ class Authorize(BizBase, AdminAuthService, AdminUserOnBoardApplicationServiceImp
                     self.switch_role(self.user.role)
             else:
                 self._entry_portal(company_id)
-            Logger().info("The user({0}) logs in to {1} successfully.".format(self.user, login_app_tip))
+            logger.info("The user({0}) logs in to {1} successfully.".format(self.user, login_app_tip))
         except Exception as e:
             tip = "The user({0}) failed to log in to {1}.".format(self.user, login_app_tip)
-            Logger().error(tip)
+            logger.error(tip)
             raise Exception(f"{tip} Authorize Failed: {e}")
 
     def _auth(self):

api_requester/http/authorize_ecoa.py

@@ -0,0 +1,94 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 5/15/2024 2:30 PM
+@Description: Description
+@File: authorize_ecoa.py
+"""
+import time
+
+from loguru import logger
+
+from api_requester.core.admin.dto.ecoa_onboard_request_dto import EcoaOnboardRequestDto
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+from api_requester.core.admin.dto.user_on_board_dto import UserOnBoardDto
+from api_requester.core.admin.service.ecoa_auth_service import AdminEcoaAuthService
+from api_requester.core.common.service.ecoa_auth_service import CommonEcoaAuthService
+from api_requester.dto.biz_base import BizBase
+from api_requester.dto.user import EClinicalUser
+from api_requester.http.sample_headers import SampleHeaders
+from api_requester.utils.constant import AppEnum
+from api_requester.utils.rsa import encrypt_password
+
+
+class AuthorizeEcoa(BizBase, AdminEcoaAuthService, CommonEcoaAuthService):
+
+    def __init__(self, user: EClinicalUser):
+        BizBase.__init__(self, user)
+        self.login_app = self.user.app
+        self.user.app = AppEnum.ADMIN.code
+        self.time_mills = time.time()
+        self.user_onboard_dto = UserOnBoardDto(-1)
+        AdminEcoaAuthService.__init__(self)
+        CommonEcoaAuthService.__init__(self)
+
+    def login(self):
+        try:
+            self._auth()
+            self._onboard()
+            self.user.app = self.login_app
+            self._app_auth()
+            logger.info("{0} logs in to {1} eCOA successfully.".format(self.user, self.login_app))
+        except Exception as e:
+            logger.error("{0} failed to log in to {1} eCOA.".format(self.user, self.login_app))
+            raise Exception(f"Authorize Failed: {e}")
+
+    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)
+        response = self.auth_ecoa_login(jwt_authentication_request_dto)
+        if response is None:
+            raise Exception(f"LoginParams failed: {response}")
+        if response.get("jwtAuthenticationResponse") is None:
+            token = response.get("token")
+        else:
+            token = response.get("jwtAuthenticationResponse").get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
+        self.time_mills = time.time()
+        return response
+
+    def _onboard(self):
+        payload = self.ecoa_study_list()
+        dto = EcoaOnboardRequestDto()
+        for sponsor_dto in payload:
+            dto.sponsorId = sponsor_dto["sponsorId"]
+            dto.envId = sponsor_dto["envId"]
+            self.user.sponsor = sponsor_dto["sponsorName"]
+            self.user.app_env = sponsor_dto["envName"]
+            for study_dto in sponsor_dto["ecoaStudyList"]:
+                if sponsor_dto["envId"] == study_dto["envId"]:
+                    dto.studyId = study_dto["studyId"]
+                    self.user.study = study_dto["studyName"]
+                break
+            break
+        self.user_onboard_dto.studyId = dto.studyId
+        self.user_onboard_dto.sponsorId = dto.sponsorId
+        self.user_onboard_dto.envId = dto.envId
+        response = self.onboard(dto)
+        token = response.get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
+        self.time_mills = time.time()
+
+    def _app_auth(self):
+        response = self.create_authentication_token()
+        if response.get("jwtAuthenticationResponse") is None:
+            token = response.get("token")
+        else:
+            token = response.get("jwtAuthenticationResponse").get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
+        self.time_mills = time.time()
+
+    def admin_auth(self):
+        return self._auth()

api_requester/http/authorize_ediary.py

@@ -0,0 +1,70 @@
+# !/usr/bin/python3
+# -*- coding:utf-8 -*-
+"""
+@Author: xiaodong.li
+@Time: 5/15/2024 2:30 PM
+@Description: Description
+@File: authorize_ecoa.py
+"""
+import time
+
+from loguru import logger
+
+from api_requester.core.admin.dto.jwt_authentication_request import JwtAuthenticationRequest
+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
+from api_requester.dto.biz_base import BizBase
+from api_requester.dto.user import EClinicalUser
+from api_requester.http.sample_headers import SampleHeaders
+from api_requester.utils.constant import AppEnum
+from api_requester.utils.rsa import encrypt_password
+
+
+class AuthorizeEdiary(BizBase, AdminSubjectAuthService, CommonSubjectAuthService):
+
+    def __init__(self, user: EClinicalUser):
+        BizBase.__init__(self, user)
+        self.login_app = self.user.app
+        self.user.app = AppEnum.ADMIN.code
+        self.time_mills = time.time()
+        self.user_onboard_dto = UserOnBoardDto(-1)
+        AdminSubjectAuthService.__init__(self)
+        CommonSubjectAuthService.__init__(self)
+
+    def login(self):
+        try:
+            self._auth()
+            self.user.app = self.login_app
+            self._app_auth()
+            logger.info("{0} logs in to {1} eDiary successfully.".format(self.user, self.login_app))
+        except Exception as e:
+            logger.error("{0} failed to log in to {1} eDiary.".format(self.user, self.login_app))
+            raise Exception(f"Authorize Failed: {e}")
+
+    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)
+        response = self.auth_subject_login(jwt_authentication_request_dto)
+        if response is None:
+            raise Exception(f"LoginParams failed: {response}")
+        if response.get("jwtAuthenticationResponse") is None:
+            token = response.get("token")
+        else:
+            token = response.get("jwtAuthenticationResponse").get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
+        self.time_mills = time.time()
+        return response
+
+    def _app_auth(self):
+        response = self.subject_auth_login()
+        if response.get("jwtAuthenticationResponse") is None:
+            token = response.get("token")
+        else:
+            token = response.get("jwtAuthenticationResponse").get("token")
+        self.headers = SampleHeaders().add_authorization(token).to_h()
+        self.time_mills = time.time()
+
+    def admin_auth(self):
+        return self._auth()

api_requester/utils/constant.py

@@ -6,7 +6,7 @@
 @Description: Description
 @File: constant.py
 """
-from enum import Enum, unique
+from enum import Enum, unique, auto
 
 
 @unique
@@ -106,3 +106,9 @@ class RoleEnum(Enum):
     DM = ("DM",)
     CRC = ("CRC",)
     CRA = ("CRA",)
+
+
+@unique
+class EdcAppType(Enum):
+    EDIARY = auto()
+    ECOA = auto()

api_requester/utils/logger.py

@@ -0,0 +1,46 @@
+"""
+Created on Mar 17, 2020
+
+@author: xiaodong.li
+"""
+import os
+import sys
+
+from loguru import logger
+
+from api_requester.utils.path import root
+
+
+def init_logger(log_filename="app.log", level="DEBUG"):
+    log_dir = get_writable_log_path()
+    logger.remove()
+    logger.add(
+        sys.stdout,
+        level=level,
+        format="<green>{time:YYYY-MM-DD HH:mm:ss}</green> | "
+               "<level>{level}</level> | "
+               "<cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - "
+               "<level>{message}</level>"
+    )
+    logger.add(
+        os.path.join(log_dir, log_filename),
+        level=level,
+        rotation="00:00",  # 每天午夜切分
+        retention="7 days",  # 最多保留7天
+        compression="zip",  # 自动压缩旧日志
+        encoding="utf-8",
+        enqueue=True  # 支持多进程
+    )
+
+
+def get_writable_log_path():
+    if getattr(sys, 'frozen', False):
+        base_path = os.path.dirname(sys.executable)
+    else:
+        base_path = root()
+    logs_dir = os.path.join(base_path, 'logs')
+    os.makedirs(logs_dir, exist_ok=True)
+    return logs_dir
+
+
+init_logger()

api_requester/utils/read_file.py

@@ -10,10 +10,9 @@ import json
 import os
 
 import yaml
+from loguru import logger
 from lxml import etree
 
-from api_requester.utils.log import Logger
-
 
 class JSONConnector:
     def __init__(self, filepath):
@@ -87,7 +86,7 @@ def connect_to(filepath, ignore_error=False):
     try:
         return connection_factory(filepath)
     except ValueError as ve:
-        Logger().error(ve)
+        logger.error(ve)
         if ignore_error is False:
             raise Exception(ve)
         else:

{eclinical_requester-1.0.10.dist-info → eclinical_requester-1.0.11.dist-info}/METADATA

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

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

@@ -1,50 +1,64 @@
-api_requester/__init__.py,sha256=voa3D8SKm31uC9BTkWCyrTNfZn2UOBxVTt2I_kSBPMY,176
+api_requester/__init__.py,sha256=-AufKHQP-o4XT_zMkWKvoiqeJNt021Kbcw0hS2sf_-U,176
 api_requester/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/core/call_api.py,sha256=OumIPQSNv5JJeghv_r2tDVzmQCDEsvTS4CEmQNz5dO8,2158
+api_requester/core/call_api.py,sha256=a756aZbaG42MWj-VLHJpfWJ5zvBpA615HDogQCdnEUw,2717
 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/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/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/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=RiXY5fgZd63KKKNqkDmqvjl9iVVvIs1PhadJt6Fxbis,1057
-api_requester/core/admin/service/user_on_board_application_service.py,sha256=qxevIpe26wXtGdBFqPsEdj7nir8MOQ3wAZsO_jxccF0,1353
+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/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=zoR1HZm6tSoaJFe_bNe2cDLV_GfhZrf2qevKt2UmTQc,1519
+api_requester/core/admin/service/impl/system_env_service_impl.py,sha256=cWea0iOpUivR3bpiyQNE_1aQKtr2_5_xN9sABV6TBUs,1502
 api_requester/core/admin/service/impl/user_on_board_application_service_impl.py,sha256=2vNFD3dFZDI5ssvrSgzg2AT-yA3nlty_eCRWRd_5-nc,694
 api_requester/core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/common/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+api_requester/core/common/api/ecoa_auth_api.py,sha256=0rOd95nPnZ4xI-0jtg_ACpLzPWjoNUlxQriPaU_5rCc,1130
+api_requester/core/common/api/subject_auth_api.py,sha256=5Bq67Cdta_CtF5BpkIXYpDbE5Cj-ZD60Iizbq6xo2Ew,799
 api_requester/core/common/api/system_env_api.py,sha256=Ogrc2vSpbjQBUIr_cUfz-TLX4DD_9eg_PabX433VQuA,634
+api_requester/core/common/dto/portal_login_t_ime.py,sha256=dVhfU7L56vBeTRnZDU7hQzqzimgWZ4ktVJCmJfsRIK4,432
 api_requester/core/common/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+api_requester/core/common/service/ecoa_auth_service.py,sha256=MyBqf76IcD0Aj7sjN1DmdJccoSeCjRONxrySuR3nW30,1459
+api_requester/core/common/service/subject_auth_service.py,sha256=jSoCH9m4f_UKUcTWbXb1J0I2WcSCgSiEA_EnCqglJog,867
 api_requester/core/common/service/system_env_service.py,sha256=SIKQCG2tIf1s4dUsSiFvOMAgai6JQ-xRP5HJ8MKF3Ts,787
 api_requester/docs/application.yaml,sha256=_yTaHYLd9CdGfM4ua3qbYOO3x36cWjFEcJmPGDB_Pak,1151
 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/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/dto/admin/cross_user_user_on_board_dto.py,sha256=VSsihBthlfJORhhVeumDQxuF0lUj5vsLUcF3131Wi1s,489
-api_requester/dto/admin/jwt_authentication_request.py,sha256=Wo9xTzpVIUJjkr4nYdnXsB7Q2nu3oFpy36K2aUUSy90,472
-api_requester/dto/admin/user_on_board_dto.py,sha256=zsCKgnEttnsCkFlXKfuzkXWbvIhfiWv3jEj8jY6GRbQ,692
 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=3MWW2n6SEeDz1E_gp3w6yRmcyoJZKsR2ffHiCWwrlvY,7612
+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/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
 api_requester/http/sample_headers.py,sha256=4a2z0ITPvnNhXiX0xZHfcexiRQdkIvEv8YUK-eGRwDU,705
 api_requester/http/token_manager.py,sha256=sQO4zd3smA0XfmEndBwXs-8rRCmjkEU48S8jWxxXevA,919
 api_requester/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/utils/constant.py,sha256=l1qhn0TkRhX6YAgJUEpiymtTmi1rSmzJVKdPVpayROs,2422
+api_requester/utils/constant.py,sha256=SpHGa9pwLsqUMWc64U6HuDq2K1S-Q1z9hRxW1cq896k,2506
 api_requester/utils/json_utils.py,sha256=0fTXGESYxuiHv4ezx_iIrmXv2qwb3Ozd1qRIXenToOQ,2614
 api_requester/utils/lib.py,sha256=wOXU4hB1tFPHT2X96zmVUfEb7hulowDVO8BN5kV9OpA,14429
-api_requester/utils/log.py,sha256=McGW0GE_8mt6GlYHT1B9cW_xGVXV3e1mkez_QJe6DkE,2885
+api_requester/utils/logger.py,sha256=JDRvNV47sCi9cPQ2oAVDuMboCJX1quS8R9wljAdqUU4,1185
 api_requester/utils/path.py,sha256=65N-cWfKylYMaP3R4_Ajzx1TlQnAD-_8RY7Dm6Ps4vQ,451
 api_requester/utils/placeholder_replacer.py,sha256=umNGeA1KCQ6Ewzsv1xEehLmHtKkgvSrfBf6mwvn7EdM,606
-api_requester/utils/read_file.py,sha256=QRE2hZaPaCo7tyY0fW7c6PLXSmc7Zp1HA-SsN_B-2gs,2325
+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.10.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.10.dist-info/METADATA,sha256=QkApRVkLEqaBAk2NIiySwE3LoHLI1kz_Hicrp-MTkOc,719
-eclinical_requester-1.0.10.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-eclinical_requester-1.0.10.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.10.dist-info/RECORD,,
+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.10.dist-info → eclinical_requester-1.0.11.dist-info}/WHEEL

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

api_requester/utils/log.py

@@ -1,91 +0,0 @@
-# !/usr/bin/python3
-# -*- coding:utf-8 -*-
-"""
-@Author: xiaodong.li
-@Time: 3/18/2024 4:59 PM
-@Description: Description
-@File: log.py
-"""
-import logging
-import os
-import re
-import time
-
-from api_requester.utils.path import root
-from api_requester.utils.time_utils import now_yyyy_mm_dd
-
-
-class Logger:
-    """
-   define log
-    """
-
-    def __init__(self, path=None, c_level=logging.INFO, f_level=logging.DEBUG):
-        if path is None:
-            path = os.path.join(root(), "logs", f"{now_yyyy_mm_dd(time.time())}.log")
-        self.path = path
-        self.sh = None
-        self.fh = None
-        # create log file in case of no file
-        if not os.path.exists(path):
-            path_dir = os.path.dirname(path)
-            if not os.path.exists(path_dir):
-                os.makedirs(path_dir)
-            file = open(path, "w", encoding="utf-8")
-            file.close()
-        # create logger
-        self.logger = logging.getLogger(path)
-        self.logger.setLevel(logging.DEBUG)
-        # in case of creating multi-logger object
-        if not self.logger.handlers:
-            # set log format
-            fmt = logging.Formatter("[%(asctime)s.%(msecs)03d] [thread:%(thread)d] [threadName:%(threadName)s] "
-                                    "[%(levelname)s %(message)s]", datefmt=r"%Y-%m-%d %H:%M:%S")
-            # %(filename)s [line:%(lineno)d]
-            # set CMD log
-            self.sh = logging.StreamHandler()
-            self.sh.setFormatter(fmt)
-            self.sh.setLevel(c_level)
-            # set log in file
-            self.fh = logging.FileHandler(path, encoding="utf-8")
-            self.fh.setFormatter(fmt)
-            self.fh.setLevel(f_level)
-            self.logger.addHandler(self.sh)
-            self.logger.addHandler(self.fh)
-
-    def __del__(self):
-        try:
-            if self.sh is not None:
-                self.logger.removeHandler(self.sh)
-            if self.fh is not None:
-                self.logger.removeHandler(self.fh)
-        finally:
-            pass
-
-    def debug(self, message):
-        self.logger.debug(self._msg(message))
-
-    def info(self, message):
-        self.logger.info(self._msg(message))
-
-    def warn(self, message):
-        self.logger.warning(self._msg(message))
-
-    def error(self, message):
-        self.logger.error(self._msg(message))
-
-    def cri(self, message):
-        self.logger.critical(self._msg(message))
-
-    @staticmethod
-    def _msg(message):
-        try:
-            if "SQL>>>" in message:
-                b = re.compile(r"\s{2,}")
-                message = b.sub(" ", message)
-                return message
-            elif re.search(r"\n\n", message):
-                message = re.sub(r"\n\n", r"\n", message)
-                return message
-        finally:
-            return message