dana-python 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

dana/disbursement/v1/api/disbursement_api.py

@@ -1238,6 +1238,13 @@ class DisbursementApi:
         )
 
 
+
+    def _get_transfer_to_dana_path(self) -> str:
+        """Transfer to DANA (topup) path based on environment."""
+        env = os.getenv("DANA_ENV", os.getenv("ENV", "sandbox")).lower()
+        return '/v1.0/emoney/topup.htm' if env == 'production' else '/rest/v1.0/emoney/topup'
+
+
     @validate_call
     def transfer_to_dana(
         self,
@@ -1503,7 +1510,7 @@ class DisbursementApi:
         _auth_settings = SnapHeader.merge_with_snap_runtime_headers(_auth_settings)
         _generated_auth = SnapHeader.get_snap_generated_auth(
             method='POST', 
-            resource_path='/rest/v1.0/emoney/topup',
+            resource_path=(self._get_transfer_to_dana_path()),
             body=transfer_to_dana_request.to_json(),
             private_key=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY'),
             private_key_path=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY_PATH')
@@ -1511,7 +1518,7 @@ class DisbursementApi:
 
         return self.api_client.param_serialize(
             method='POST',
-            resource_path='/rest/v1.0/emoney/topup',
+            resource_path=(self._get_transfer_to_dana_path()),
             path_params=_path_params,
             query_params=_query_params,
             header_params=_header_params,
@@ -1526,6 +1533,13 @@ class DisbursementApi:
         )
 
 
+
+    def _get_transfer_to_dana_inquiry_status_path(self) -> str:
+        """Topup-status inquiry path based on environment."""
+        env = os.getenv("DANA_ENV", os.getenv("ENV", "sandbox")).lower()
+        return '/v1.0/emoney/topup-status.htm' if env == 'production' else '/rest/v1.0/emoney/topup-status'
+
+
     @validate_call
     def transfer_to_dana_inquiry_status(
         self,
@@ -1791,7 +1805,7 @@ class DisbursementApi:
         _auth_settings = SnapHeader.merge_with_snap_runtime_headers(_auth_settings)
         _generated_auth = SnapHeader.get_snap_generated_auth(
             method='POST', 
-            resource_path='/rest/v1.0/emoney/topup-status',
+            resource_path=(self._get_transfer_to_dana_inquiry_status_path()),
             body=transfer_to_dana_inquiry_status_request.to_json(),
             private_key=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY'),
             private_key_path=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY_PATH')
@@ -1799,7 +1813,7 @@ class DisbursementApi:
 
         return self.api_client.param_serialize(
             method='POST',
-            resource_path='/rest/v1.0/emoney/topup-status',
+            resource_path=(self._get_transfer_to_dana_inquiry_status_path()),
             path_params=_path_params,
             query_params=_query_params,
             header_params=_header_params,

dana/exceptions.py

@@ -22,7 +22,7 @@
     Do not edit the class manually.
 """  # noqa: E501
 
-from typing import Any, Optional
+from typing import Any, Dict, List, Optional
 from typing_extensions import Self
 
 class OpenApiException(Exception):
@@ -122,7 +122,11 @@ class ApiException(OpenApiException):
         *,
         body: Optional[str] = None,
         data: Optional[Any] = None,
+        contexts: Optional[List[Dict[str, str]]] = None,
     ) -> None:
+        self.contexts = contexts
+        if contexts is not None and reason is None:
+            reason = "; ".join(f"{c['field']}: {c['message']}" for c in contexts)
         self.status = status
         self.reason = reason
         self.body = body

dana/payment_gateway/v1/custom_validation.py

@@ -21,33 +21,38 @@ Validations are registered in the validation_registry and executed via custom_va
 
 import os
 import re
-from typing import Any, Dict, List, Callable
+from typing import Any, Callable, Dict, FrozenSet, List, Set
+
 from dana.utils.date_validation import validate_valid_up_to_date
 from dana.exceptions import ApiException
 
 # Money value pattern: digits (1-16) + "." + exactly 2 digits (e.g. 10000.00)
 MONEY_VALUE_PATTERN = re.compile(r'^\d{1,16}\.\d{2}$')
 
-# In sandbox, only these payMethods are available (Payment Gateway).
-SANDBOX_ALLOWED_PAY_METHODS = frozenset({
+SANDBOX_ALLOWED_PAY_METHODS: FrozenSet[str] = frozenset({
     'BALANCE', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'NETWORK_PAY',
 })
 
-# In sandbox, only these payOptions are available (Payment Gateway).
-# API may send full identifiers (e.g. VIRTUAL_ACCOUNT_BRI); we accept exact match or suffix _OPTION.
-SANDBOX_ALLOWED_PAY_OPTIONS = frozenset({
+SANDBOX_ALLOWED_PAY_OPTIONS: FrozenSet[str] = frozenset({
     'CARD', 'QRIS', 'BRI', 'PANIN', 'CIMB', 'MANDIRI', 'BTPN',
 })
 
+CREDIT_DEBIT_CARD_PAY_METHODS: Set[str] = {'CREDIT_CARD', 'DEBIT_CARD'}
+NETWORK_PAY_PG_CARD = 'NETWORK_PAY_PG_CARD'
+EWALLET_PAY_OPTIONS: Set[str] = {
+    'NETWORK_PAY_PG_SPAY',
+    'NETWORK_PAY_PG_OVO',
+    'NETWORK_PAY_PG_GOPAY',
+    'NETWORK_PAY_PG_LINKAJA',
+}
+
 
 def _is_sandbox() -> bool:
-    """Return True if current environment is sandbox (DANA_ENV or ENV)."""
     env = os.getenv('DANA_ENV', os.getenv('ENV', 'sandbox')).lower()
     return env == 'sandbox'
 
 
 def _pay_option_allowed_in_sandbox(value: str) -> bool:
-    """Check if payOption value is allowed in sandbox (exact or suffix match, e.g. VIRTUAL_ACCOUNT_BRI)."""
     if not value or not str(value).strip():
         return False
     s = str(value).strip()
@@ -59,160 +64,222 @@ def _pay_option_allowed_in_sandbox(value: str) -> bool:
     return False
 
 
-def validate_additional_info_required(request: Any) -> None:
-    """
-    Validate that additionalInfo must exist.
+def _normalize_value(value: Any) -> str:
+    if value is None:
+        return ''
+    if hasattr(value, 'value'):
+        return str(getattr(value, 'value')).strip()
+    return str(value).strip()
+
+
+def _trim_str(value: Any) -> str:
+    if value is None:
+        return ''
+    return str(value).strip()
+
 
-    Raises:
-        ApiException: If additionalInfo is missing
-    """
+def _rune_len(s: str) -> int:
+    return len(list(s))
+
+
+def _ctx(field: str, message: str) -> Dict[str, str]:
+    return {'field': field, 'message': message}
+
+
+def validate_additional_info_required(request: Any) -> None:
     if request is None:
         return
     if hasattr(request, 'additional_info') and request.additional_info is None:
-        raise ApiException(
-            status=0,
-            reason='additionalInfo is required'
-        )
+        raise ApiException(status=0, contexts=[_ctx('additionalInfo', 'additionalInfo is required')])
 
 
 def validate_money_value_pattern(request: Any) -> None:
-    """
-    Validate that Money value matches pattern (e.g. 10000.00): ^\\d{1,16}\\.\\d{2}$
-
-    Raises:
-        ApiException: If amount.value is missing or does not match pattern
-    """
     if request is None:
         return
     if not hasattr(request, 'amount') or request.amount is None:
         return
     value = getattr(request.amount, 'value', None)
     if value is None or value == '':
-        raise ApiException(
-            status=0,
-            reason='amount.value is required'
-        )
+        raise ApiException(status=0, contexts=[_ctx('amount.value', 'amount.value is required')])
     if not MONEY_VALUE_PATTERN.match(str(value)):
-        raise ApiException(
-            status=0,
-            reason=f'amount.value must match pattern (e.g. 10000.00): got {value!r}'
-        )
+        raise ApiException(status=0, contexts=[
+            _ctx('amount.value', f'amount.value must match pattern (e.g. 10000.00): got {value!r}')
+        ])
 
 
 def validate_valid_up_to_create_order_request(request: Any) -> None:
-    """
-    Validate validUpTo field in CreateOrderByApiRequest or CreateOrderByRedirectRequest.
-    
-    This function handles both request types directly (not wrapped in CreateOrderRequest):
-    - CreateOrderByApiRequest: validates valid_up_to directly
-    - CreateOrderByRedirectRequest: validates valid_up_to directly
-    
-    Args:
-        request: The request object to validate
-    
-    Raises:
-        ApiException: If validation fails
-    """
     if request is None:
         return
-    
-    # Handle CreateOrderByApiRequest or CreateOrderByRedirectRequest directly
     if hasattr(request, 'valid_up_to') and request.valid_up_to is not None:
         try:
             validate_valid_up_to_date(request.valid_up_to)
         except ValueError as e:
-            raise ApiException(
-                status=0,
-                reason=f'validUpTo validation failed: {str(e)}'
-            ) from e
+            raise ApiException(status=0, contexts=[
+                _ctx('validUpTo', f'validUpTo validation failed: {str(e)}')
+            ]) from e
 
 
 def validate_external_store_id_for_qris(request: Any) -> None:
-    """
-    Validate that externalStoreId is required when payOption is NETWORK_PAY_PG_QRIS.
-    
-    This function checks if any payOption in payOptionDetails is NETWORK_PAY_PG_QRIS,
-    and if so, ensures externalStoreId is provided.
-    
-    Args:
-        request: The request object to validate
-    
-    Raises:
-        ApiException: If validation fails
-    """
     if request is None:
         return
-    
-    # Check if request has payOptionDetails
     if not hasattr(request, 'pay_option_details') or request.pay_option_details is None:
         return
-    
-    # Check if any payOption is NETWORK_PAY_PG_QRIS
     has_qris = False
     if isinstance(request.pay_option_details, list):
         for pay_option_detail in request.pay_option_details:
             if hasattr(pay_option_detail, 'pay_option') and pay_option_detail.pay_option == 'NETWORK_PAY_PG_QRIS':
                 has_qris = True
                 break
-    
-    # If QRIS is found, externalStoreId must be provided
     if has_qris:
         external_store_id = None
         if hasattr(request, 'external_store_id'):
             external_store_id = request.external_store_id
-        
         if not external_store_id or (isinstance(external_store_id, str) and external_store_id.strip() == ''):
-            raise ApiException(
-                status=0,
-                reason='externalStoreId is required when payOption is NETWORK_PAY_PG_QRIS'
-            )
+            raise ApiException(status=0, contexts=[
+                _ctx('externalStoreId', 'externalStoreId is required when payOption is NETWORK_PAY_PG_QRIS')
+            ])
 
 
 def validate_sandbox_pay_method_and_pay_option(request: Any) -> None:
-    """
-    In sandbox, only certain payMethod and payOption values are available.
-
-    - payMethod: only BALANCE, CREDIT_CARD, DEBIT_CARD, VIRTUAL_ACCOUNT, NETWORK_PAY.
-    - payOption: only CARD, QRIS, BRI, PANIN, CIMB, MANDIRI, BTPN (exact or suffix, e.g. VIRTUAL_ACCOUNT_BRI).
-
-    Skipped when not in sandbox (DANA_ENV / ENV != sandbox).
-
-    Raises:
-        ApiException: If in sandbox and a payMethod or payOption is not allowed.
-    """
     if request is None or not _is_sandbox():
         return
-    if not hasattr(request, 'pay_option_details') or request.pay_option_details is None:
+    pay_option_details = getattr(request, 'pay_option_details', None)
+    if not pay_option_details or not isinstance(pay_option_details, list):
         return
-    if not isinstance(request.pay_option_details, list):
-        return
-    for idx, detail in enumerate(request.pay_option_details):
+    for i, detail in enumerate(pay_option_details):
+        if not detail:
+            continue
         if hasattr(detail, 'pay_method') and detail.pay_method is not None:
-            pm = getattr(detail.pay_method, 'value', detail.pay_method) if hasattr(detail.pay_method, 'value') else detail.pay_method
-            pm_str = str(pm).strip()
+            pm_str = _normalize_value(detail.pay_method)
             if pm_str and pm_str not in SANDBOX_ALLOWED_PAY_METHODS:
-                raise ApiException(
-                    status=0,
-                    reason=(
-                        f'In sandbox, payMethod must be one of {sorted(SANDBOX_ALLOWED_PAY_METHODS)}; '
-                        f'got {pm_str!r} in payOptionDetails[{idx}]'
+                raise ApiException(status=0, contexts=[
+                    _ctx(
+                        f'payOptionDetails[{i}].payMethod',
+                        (
+                            f'In sandbox, payMethod must be one of [{", ".join(sorted(SANDBOX_ALLOWED_PAY_METHODS))}]; '
+                            f'got {pm_str}'
+                        ),
                     )
-                )
+                ])
         if hasattr(detail, 'pay_option') and detail.pay_option is not None:
-            po = getattr(detail.pay_option, 'value', detail.pay_option) if hasattr(detail.pay_option, 'value') else detail.pay_option
-            po_str = str(po).strip()
-            # Empty payOption is allowed (e.g. for BALANCE)
+            po_str = _normalize_value(detail.pay_option)
             if po_str and not _pay_option_allowed_in_sandbox(po_str):
-                raise ApiException(
-                    status=0,
-                    reason=(
-                        f'In sandbox, payOption must be one of {sorted(SANDBOX_ALLOWED_PAY_OPTIONS)} '
-                        f'(or suffix like VIRTUAL_ACCOUNT_BRI); got {po!r} in payOptionDetails[{idx}]'
+                raise ApiException(status=0, contexts=[
+                    _ctx(
+                        f'payOptionDetails[{i}].payOption',
+                        (
+                            f'In sandbox, payOption must be one of [{", ".join(sorted(SANDBOX_ALLOWED_PAY_OPTIONS))}] '
+                            f'(or suffix like VIRTUAL_ACCOUNT_BRI); got {po_str}'
+                        ),
                     )
+                ])
+
+
+def validate_conditional_pay_option_additional_info_create_order_request(request: Any) -> None:
+    if request is None:
+        return
+    pay_option_details = getattr(request, 'pay_option_details', None)
+    if not pay_option_details or not isinstance(pay_option_details, list):
+        return
+
+    contexts: List[Dict[str, str]] = []
+
+    for i, detail in enumerate(pay_option_details):
+        if not detail:
+            continue
+        pay_method = _trim_str(getattr(detail, 'pay_method', None))
+        pay_option = _trim_str(getattr(detail, 'pay_option', None))
+        additional_info = getattr(detail, 'additional_info', None)
+        phone_raw = None
+        if additional_info is not None:
+            phone_raw = getattr(additional_info, 'phone_number', None)
+        phone_number = _trim_str(phone_raw)
+
+        is_card = pay_method in CREDIT_DEBIT_CARD_PAY_METHODS or pay_option == NETWORK_PAY_PG_CARD
+        is_ewallet = pay_option in EWALLET_PAY_OPTIONS
+
+        if is_card or is_ewallet:
+            field = f'payOptionDetails[{i}].additionalInfo.phoneNumber'
+            if not phone_number:
+                contexts.append(
+                    _ctx(field, f'phoneNumber is required for card/e-wallet payment (payOptionDetails[{i}])')
                 )
+            else:
+                ln = _rune_len(phone_number)
+                if ln < 1 or ln > 15:
+                    contexts.append(
+                        _ctx(field, f'phoneNumber must be between 1 and 15 characters (payOptionDetails[{i}])')
+                    )
+
+    if contexts:
+        raise ApiException(status=0, contexts=contexts)
+
+
+def validate_optional_fields_with_required_nested_create_order_request(request: Any) -> None:
+    if request is None:
+        return
+    additional_info = getattr(request, 'additional_info', None)
+    if additional_info is None:
+        return
+    order = getattr(additional_info, 'order', None)
+    if not order:
+        return
+
+    contexts: List[Dict[str, str]] = []
+
+    buyer = getattr(order, 'buyer', None)
+    if buyer:
+        ext_type = _trim_str(getattr(buyer, 'external_user_type', None))
+        ext_id = _trim_str(getattr(buyer, 'external_user_id', None))
+        has_type = bool(ext_type)
+        has_id = bool(ext_id)
+        if has_id and not has_type:
+            contexts.append(
+                _ctx(
+                    'additionalInfo.order.buyer.externalUserType',
+                    'externalUserType is required when externalUserId is filled',
+                )
+            )
+        if has_type and not has_id:
+            contexts.append(
+                _ctx(
+                    'additionalInfo.order.buyer.externalUserId',
+                    'externalUserId is required when externalUserType is filled',
+                )
+            )
+
+    goods = getattr(order, 'goods', None)
+    if isinstance(goods, list) and len(goods) > 0:
+        for i, g in enumerate(goods):
+            if not g:
+                continue
+            name = _trim_str(getattr(g, 'name', None))
+            if not name:
+                contexts.append(
+                    _ctx(
+                        f'additionalInfo.order.goods[{i}].name',
+                        'name is required when goods is filled',
+                    )
+                )
+
+    shipping_info = getattr(order, 'shipping_info', None)
+    if isinstance(shipping_info, list) and len(shipping_info) > 0:
+        for i, s in enumerate(shipping_info):
+            if not s:
+                continue
+            first_name = _trim_str(getattr(s, 'first_name', None))
+            if not first_name:
+                contexts.append(
+                    _ctx(
+                        f'additionalInfo.order.shippingInfo[{i}].firstName',
+                        'firstName is required when shippingInfo is filled',
+                    )
+                )
+
+    if contexts:
+        raise ApiException(status=0, contexts=contexts)
 
 
-# Validation registry maps request class names to their validation functions
 validation_registry: Dict[str, List[Callable[[Any], None]]] = {
     'CreateOrderByApiRequest': [
         validate_additional_info_required,
@@ -220,12 +287,16 @@ validation_registry: Dict[str, List[Callable[[Any], None]]] = {
         validate_valid_up_to_create_order_request,
         validate_external_store_id_for_qris,
         validate_sandbox_pay_method_and_pay_option,
+        validate_conditional_pay_option_additional_info_create_order_request,
+        validate_optional_fields_with_required_nested_create_order_request,
     ],
     'CreateOrderByRedirectRequest': [
         validate_additional_info_required,
         validate_money_value_pattern,
         validate_valid_up_to_create_order_request,
         validate_sandbox_pay_method_and_pay_option,
+        validate_conditional_pay_option_additional_info_create_order_request,
+        validate_optional_fields_with_required_nested_create_order_request,
     ],
     'CreateOrderRequest': [
         validate_additional_info_required,
@@ -233,30 +304,30 @@ validation_registry: Dict[str, List[Callable[[Any], None]]] = {
         validate_valid_up_to_create_order_request,
         validate_external_store_id_for_qris,
         validate_sandbox_pay_method_and_pay_option,
+        validate_conditional_pay_option_additional_info_create_order_request,
+        validate_optional_fields_with_required_nested_create_order_request,
     ],
-    # Add more request types and their validations here as needed
 }
 
 
 def custom_validation(request: Any) -> None:
-    """
-    Perform custom validations on the request based on its type.
-    
-    This function checks the request type and runs the appropriate validations from the registry.
-    
-    Args:
-        request: The request object to validate (can be any type)
-    
-    Raises:
-        ApiException: If validation fails
-    """
+    """Run all validators for the request type and aggregate client validation contexts."""
     if request is None:
         return
-    
-    # Get the class name of the request
+
     class_name = request.__class__.__name__
-    
-    # Check if this request type has validations registered
-    if class_name in validation_registry:
-        for validator in validation_registry[class_name]:
+    if class_name not in validation_registry:
+        return
+
+    aggregated: List[Dict[str, str]] = []
+    for validator in validation_registry[class_name]:
+        try:
             validator(request)
+        except ApiException as e:
+            if e.contexts:
+                aggregated.extend(e.contexts)
+            else:
+                raise
+
+    if aggregated:
+        raise ApiException(status=0, contexts=aggregated)

dana/utils/script.py

@@ -15,10 +15,23 @@
 import importlib
 import pkgutil
 import os
+import re
 from typing import List
 
 PACKAGE_NAME = 'dana'
 
+# Only single path segments that are valid Python identifiers (no traversal / injection).
+_SAFE_PKG_SEGMENT = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
+
+
+def _assert_safe_import_segment(name: str, label: str) -> None:
+    if not name or not _SAFE_PKG_SEGMENT.fullmatch(name):
+        raise ValueError(
+            f"Refusing dynamic import: disallowed {label} {name!r} "
+            "(expected a single identifier-like package segment)"
+        )
+
+
 def import_all_models(base_path: str) -> None:
     """
     Imports all model modules from subdirectories of the specified base path.
@@ -48,6 +61,8 @@ def import_all_models(base_path: str) -> None:
         path_to_domain: List[str] = getattr(subdomain.module_finder, 'path', '')
         domain = os.path.basename(path_to_domain)
 
-        # Construct the full module path and import
+        # Construct the full module path and import (whitelist segments — no dynamic/untrusted strings)
+        _assert_safe_import_segment(domain, "domain")
+        _assert_safe_import_segment(subdomain.name, "subdomain")
         module_name = f"{PACKAGE_NAME}.{domain}.{subdomain.name}.models"
         importlib.import_module(module_name)

dana/widget/v1/custom_validation.py

@@ -19,62 +19,94 @@ This module provides custom validation functions for Widget API requests.
 Validations are registered in the validation_registry and executed via custom_validation().
 """
 
-from typing import Any, Dict, List, Callable
+from typing import Any, Callable, Dict, List
+
 from dana.utils.date_validation import validate_valid_up_to_date
 from dana.exceptions import ApiException
 
 
+def _ctx(field: str, message: str) -> Dict[str, str]:
+    return {'field': field, 'message': message}
+
+
 def validate_valid_up_to_widget_payment_request(request: Any) -> None:
-    """
-    Validate validUpTo field in WidgetPaymentRequest.
-    
-    Args:
-        request: The request object to validate
-    
-    Raises:
-        ApiException: If validation fails
-    """
+    """Validate validUpTo field in WidgetPaymentRequest."""
     if request is None:
         return
-    
     if hasattr(request, 'valid_up_to') and request.valid_up_to is not None:
         try:
             validate_valid_up_to_date(request.valid_up_to)
         except ValueError as e:
-            raise ApiException(
-                status=0,
-                reason=f'validUpTo validation failed: {str(e)}'
-            ) from e
+            raise ApiException(status=0, contexts=[
+                _ctx('validUpTo', f'validUpTo validation failed: {str(e)}')
+            ]) from e
+
+
+def _contains_forbidden_auth_code_delimiters(auth_code: str) -> bool:
+    return '&' in auth_code or '=' in auth_code
+
+
+def validate_apply_token_auth_code_authorization_code(request: Any) -> None:
+    """authCode must not contain URL query delimiter characters (pasted query string)."""
+    if request is None:
+        return
+    auth_code = getattr(request, 'auth_code', None)
+    if auth_code is None:
+        return
+    s = str(auth_code)
+    if s and _contains_forbidden_auth_code_delimiters(s):
+        raise ApiException(status=0, contexts=[
+            _ctx('authCode', "authCode must not contain URL query delimiter characters ('&' or '=')")
+        ])
+
+
+def validate_apply_token_auth_code_refresh_token(request: Any) -> None:
+    """If authCode is present on refresh-token request, apply the same rule."""
+    if request is None:
+        return
+    auth_code = getattr(request, 'auth_code', None)
+    if auth_code is None:
+        return
+    trimmed = str(auth_code).strip()
+    if not trimmed:
+        return
+    if _contains_forbidden_auth_code_delimiters(trimmed):
+        raise ApiException(status=0, contexts=[
+            _ctx('authCode', "authCode must not contain URL query delimiter characters ('&' or '=')")
+        ])
 
 
-# Validation registry maps request class names to their validation functions
 validation_registry: Dict[str, List[Callable[[Any], None]]] = {
     'WidgetPaymentRequest': [
         validate_valid_up_to_widget_payment_request,
     ],
-    # Add more request types and their validations here as needed
+    'ApplyTokenAuthorizationCodeRequest': [
+        validate_apply_token_auth_code_authorization_code,
+    ],
+    'ApplyTokenRefreshTokenRequest': [
+        validate_apply_token_auth_code_refresh_token,
+    ],
 }
 
 
 def custom_validation(request: Any) -> None:
-    """
-    Perform custom validations on the request based on its type.
-    
-    This function checks the request type and runs the appropriate validations from the registry.
-    
-    Args:
-        request: The request object to validate (can be any type)
-    
-    Raises:
-        ApiException: If validation fails
-    """
+    """Run all validators for the request type and aggregate client validation contexts."""
     if request is None:
         return
-    
-    # Get the class name of the request
+
     class_name = request.__class__.__name__
-    
-    # Check if this request type has validations registered
-    if class_name in validation_registry:
-        for validator in validation_registry[class_name]:
+    if class_name not in validation_registry:
+        return
+
+    aggregated: List[Dict[str, str]] = []
+    for validator in validation_registry[class_name]:
+        try:
             validator(request)
+        except ApiException as e:
+            if e.contexts:
+                aggregated.extend(e.contexts)
+            else:
+                raise
+
+    if aggregated:
+        raise ApiException(status=0, contexts=aggregated)

{dana_python-2.1.0.dist-info → dana_python-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.1.0
+Version: 2.1.2
 Summary: API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs
 Author-email: DANA Package Manager  <package-manager@dana.id>
 Maintainer-email: DANA Package Manager  <package-manager@dana.id>
@@ -12,9 +12,9 @@ Requires-Python: >3.9.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: annotated-types==0.7.0
-Requires-Dist: cffi==1.17.1
+Requires-Dist: cffi==2.0.0
 Requires-Dist: cryptography<46.0.0,>=44.0.2
-Requires-Dist: pycparser==2.22
+Requires-Dist: pycparser==2.23
 Requires-Dist: pydantic<3.0.0,>=2.10.6
 Requires-Dist: pydantic-core<3.0.0,>=2.27.2
 Requires-Dist: python-dateutil==2.9.0.post0
@@ -88,7 +88,7 @@ Before using the SDK, please make sure to set the following environment variable
 | ---------------------- | ---------------------------------------------------------------------------------------       | ------------------------------------------------------------------------------- |
 | `ENV` or `DANA_ENV`    | Defines which environment the SDK will use. Possible values: `SANDBOX` or `PRODUCTION`.       | `SANDBOX`                                                                       |
 | `X_PARTNER_ID`         | Unique identifier for partner, provided by DANA, also known as `clientId`.                    | 1970010100000000000000                                                          |
-| `PRIVATE_KEY`          | Your private key string.                                                                      | `-----BEGIN PRIVATE KEY-----MIIBVgIBADANBg...LsvTqw==-----END PRIVATE KEY-----` |
+| `PRIVATE_KEY`          | Your private key string.                                                                      | |
 | `PRIVATE_KEY_PATH`     | Path to your private key file. If both are set, `PRIVATE_KEY_PATH` is used.                   | /path/to/your_private_key.pem                                                   |
 | `DANA_PUBLIC_KEY`      | DANA public key string for parsing webhook.                                                   | `-----BEGIN PUBLIC KEY-----MIIBIjANBgkq...Do/QIDAQAB-----END PUBLIC KEY-----`   |
 | `DANA_PUBLIC_KEY_PATH` | Path to DANA public key file for parsing webhook. If both set, `DANA_PUBLIC_KEY_PATH is used. | /path/to/dana_public_key.pem                                                    |

{dana_python-2.1.0.dist-info → dana_python-2.1.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dana/__init__.py,sha256=_1fR4wVGZVf1d5G_ogKEEQkJ2fc6z_Zv4qDTlALTCHg,593
 dana/api_client.py,sha256=Rn8Wyuz77U4A9uI_2wfOsasWtT8BqKxNl0XSC6dVYgA,28653
 dana/api_response.py,sha256=J58dA1ZxuIRYq9ZaK6xJRUdtwAvdOfB3J_hy6QV3KcM,1245
-dana/exceptions.py,sha256=yklJ7bXMsd4adEsJcdAb-MIOFZC2dchZOQFZh5Zbj5M,6940
+dana/exceptions.py,sha256=DD075byy8lQC56nP6x1S7rc-kSab9OBb9tS84OPQutQ,7176
 dana/rest.py,sha256=XvaqswSR6cYFiKj6n-qNUenYjB2FbjqlyG9tuo2-lqM,10268
 dana/base/__init__.py,sha256=bMn0d6EvbwtmxNyZya0vkccpsMwofvp0LvA_siJ0pxI,593
 dana/base/configuration.py,sha256=dVMKHdZ94rlP1IErcis29oE7Nvr4ewrCMGh-3lKcc64,18410
@@ -11,7 +11,7 @@ dana/disbursement/__init__.py,sha256=_1fR4wVGZVf1d5G_ogKEEQkJ2fc6z_Zv4qDTlALTCHg
 dana/disbursement/v1/__init__.py,sha256=C981Ksji-mo9bOhFhI-9g0upO279XZ1sn8a6GIHkU-k,2983
 dana/disbursement/v1/enum.py,sha256=yRZLRYwyvzfg06XJhKTPbIZT8__IzPMgzDRnknCM-lA,861
 dana/disbursement/v1/api/__init__.py,sha256=g22N5qjTc2jl1wsbCydP1g7cqWBthEaOB5g4SWlp6_c,711
-dana/disbursement/v1/api/disbursement_api.py,sha256=YG_LLN3MjCPqo7AomREVpH9FtL8IKd_9R5AsTOWLdj0,74540
+dana/disbursement/v1/api/disbursement_api.py,sha256=6I5liei3pVDM02wUMvQYTvT82X3Xj0_M1wPPjyEvksc,75191
 dana/disbursement/v1/models/__init__.py,sha256=eCiQWHiKPdQvcbAz7kclRMGoHL4qMIm2DPakBtGxVm4,2858
 dana/disbursement/v1/models/bank_account_inquiry_request.py,sha256=-qK599Biioyhn-RMUxq02hnzT2qkYOGEuFLDxIaOfJk,5431
 dana/disbursement/v1/models/bank_account_inquiry_request_additional_info.py,sha256=cDP4HFvHWlOp6ZWZ00JTF1kbBAz2om7Kpvvx0ADylzE,6028
@@ -83,7 +83,7 @@ dana/merchant_management/v1/models/update_shop_response_response_head.py,sha256=
 dana/merchant_management/v1/models/user_name.py,sha256=eRNJu5iVsMZZdU7nA9QA1g_4RV-bxxGy4MGIBNbXevs,4366
 dana/payment_gateway/__init__.py,sha256=_1fR4wVGZVf1d5G_ogKEEQkJ2fc6z_Zv4qDTlALTCHg,593
 dana/payment_gateway/v1/__init__.py,sha256=cJRNM80F042f3ZsUXeP5t9wTajH5NDBbpnXSV5y_k4E,4243
-dana/payment_gateway/v1/custom_validation.py,sha256=yyKYszahK9wF1cleYPC345yqtEahGHyCuEZy_Q7Jkso,9659
+dana/payment_gateway/v1/custom_validation.py,sha256=GAWbY2tjVtraBQih1ImkFRYlvcv3qZ25RffhY_fLKVI,12312
 dana/payment_gateway/v1/enum.py,sha256=PXgJwvF2UXXxTPTAJiN5kV-z2kHYWplpXDGd3u3LzRk,2623
 dana/payment_gateway/v1/api/__init__.py,sha256=xYZF0wAVxZ7tn-36ofOKJWEJzc-u4ixG8-gKbGK2Bng,942
 dana/payment_gateway/v1/api/payment_gateway_api.py,sha256=oLu6Y1WtV7qSyXuaQCtgfR_oSdeyevMyXTtp-2RVCGY,63315
@@ -131,7 +131,7 @@ dana/utils/date_validation.py,sha256=W3t5OH98jf2EJ8PhcTOSNNUWXoH8ykaSd7S76jY6bBI
 dana/utils/models.py,sha256=5MYKKkZjO76k-hmrlK8S_LR1jbFRHQBAfZKmyMciX0I,1718
 dana/utils/open_api_configuration.py,sha256=IQfn3c7Zs4dqOOrm1tKWBoTRdCus2alFnzRL3Yjf5ec,14805
 dana/utils/open_api_header.py,sha256=uYUpmnnO5PI2tu30LNx3hE6fI-NOc2VMkc1P3G9xZpw,9537
-dana/utils/script.py,sha256=MjJQAXAjako7oeZai25VJy0PGQObbbE9zH-26xOAi5A,1850
+dana/utils/script.py,sha256=zel7LB6GmIGIFyaegYdtmGZj-0tcwe6xuTXvGz-8vLw,2480
 dana/utils/snap_configuration.py,sha256=MZy4dBydo1PqvcB8XVVTBysWdoPmQ8ct7Gzp7jIMFQA,21531
 dana/utils/snap_header.py,sha256=fCmUJlwpb-cvkPTE3MseKNEeVRPVSJXixHxqFrAuBUU,13637
 dana/utils/url.py,sha256=wCDthoodIDANoth6SqSoiIdNwc-hJLNjFBdf_fSjU_4,1965
@@ -146,7 +146,7 @@ dana/webhook/shop_info.py,sha256=LtPO10Jhlq2K70AiFUB2I-YSKR-mU9m_6OvvCgalXxY,476
 dana/webhook/webhook.py,sha256=Pi0rJOG4ogrxXcqEdYWPBPL7iCXoY--LEo_YtqRRLwI,9569
 dana/widget/__init__.py,sha256=_1fR4wVGZVf1d5G_ogKEEQkJ2fc6z_Zv4qDTlALTCHg,593
 dana/widget/v1/__init__.py,sha256=ibJjQQ3NDAK_UwYZKHZzBVAScX4mkQixi_LD3RGTr4U,5576
-dana/widget/v1/custom_validation.py,sha256=S5HxeW5qzHd3tsBBKTdDi1Cjw9Y6V5fMnSAQLF1EW5M,2565
+dana/widget/v1/custom_validation.py,sha256=KDaglDbKrFksCq7bSlgTqUxWeILGavGfFYLXxXt8_r8,3802
 dana/widget/v1/enum.py,sha256=LhI4IjMAb9mm0DB--L86KFWAoWcMXJK-4vCpLLu5yeQ,3443
 dana/widget/v1/util.py,sha256=qxoYnUij5x3QmXb3R8JmcaoJCTnvMcFgGtEUqxITCbA,11250
 dana/widget/v1/api/__init__.py,sha256=0M_z47tKg4vjaHIDSSE7f9COYZd1KmxVl40ZMi1kjog,922
@@ -209,8 +209,8 @@ dana/widget/v1/models/virtual_account_info.py,sha256=qCFyTqwOFY0KwawiQhRfWYwv0Hv
 dana/widget/v1/models/widget_payment_request.py,sha256=KZPOauNqtDvtETLSAgkfgLagOiX2H5KaOGroSbRKCAg,8469
 dana/widget/v1/models/widget_payment_request_additional_info.py,sha256=Qa4Akl-KxeBdh3ITnb0_LxVmgZA_YJsYgW_MHKTHj1A,6273
 dana/widget/v1/models/widget_payment_response.py,sha256=KNfxpyOeNjyRG8aNRzTCaY1W5i0PgSVj3x2O8I6b_kE,6037
-dana_python-2.1.0.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
-dana_python-2.1.0.dist-info/METADATA,sha256=LkKVQymXEhh_A7fqIbBfgrcHibdsJDDqwm7IQqxfnK8,5649
-dana_python-2.1.0.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-dana_python-2.1.0.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
-dana_python-2.1.0.dist-info/RECORD,,
+dana_python-2.1.2.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
+dana_python-2.1.2.dist-info/METADATA,sha256=UaXAzPy-Ar2Eg1ADNdPklqIXC9hU-T_fwSLLAkTXu9s,5568
+dana_python-2.1.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+dana_python-2.1.2.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
+dana_python-2.1.2.dist-info/RECORD,,

{dana_python-2.1.0.dist-info → dana_python-2.1.2.dist-info}/WHEEL

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