dana-python 2.1.7__tar.gz → 2.1.9__tar.gz

{dana_python-2.1.7/dana_python.egg-info → dana_python-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.1.7
+Version: 2.1.9
 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>

{dana_python-2.1.7 → dana_python-2.1.9}/dana/merchant_management/v1/enum.py

@@ -22,6 +22,7 @@ class SizeType(str, Enum):
     UKE = "UKE"
     UME = "UME"
     UBE = "UBE"
+    URE = "URE"
 
 class Loyalty(str, Enum):
     TRUE = "true"

{dana_python-2.1.7 → dana_python-2.1.9}/dana/merchant_management/v1/models/create_shop_request.py

@@ -94,8 +94,8 @@ class CreateShopRequest(BaseModel, BaseSdkModel):
     @field_validator('size_type')
     def size_type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in set(['UMI', 'UKE', 'UME', 'UBE']):
-            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE')")
+        if value not in set(['UMI', 'UKE', 'UME', 'UBE', 'URE']):
+            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE', 'URE')")
         return value
 
     @field_validator('tax_no')

{dana_python-2.1.7 → dana_python-2.1.9}/dana/merchant_management/v1/models/merchant_information.py

@@ -123,8 +123,8 @@ class MerchantInformation(BaseModel, BaseSdkModel):
         if value is None:
             return value
 
-        if value not in set(['UMI', 'UKE', 'UME', 'UBE']):
-            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE')")
+        if value not in set(['UMI', 'UKE', 'UME', 'UBE', 'URE']):
+            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE', 'URE')")
         return value
 
     @field_validator('tax_no')

{dana_python-2.1.7 → dana_python-2.1.9}/dana/merchant_management/v1/models/shop_resource_info.py

@@ -34,7 +34,7 @@ import json
 
 from dana.base.model import BaseSdkModel
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from dana.merchant_management.v1.models.address_info import AddressInfo
 from typing import Optional, Set
@@ -60,6 +60,16 @@ class ShopResourceInfo(BaseModel, BaseSdkModel):
     nmid: Optional[StrictStr] = Field(default=None, description="Network merchant identifier")
     __properties: ClassVar[List[str]] = ["merchantId", "parentDivisionId", "parentRoleType", "mainName", "sizeType", "shopAddress", "externalShopId", "logoUrlMap", "extInfo", "ln", "lat", "nmid"]
 
+    @field_validator('size_type')
+    def size_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['UMI', 'UKE', 'UME', 'UBE', 'URE']):
+            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE', 'URE')")
+        return value
+
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,

{dana_python-2.1.7 → dana_python-2.1.9}/dana/merchant_management/v1/models/update_shop_request.py

@@ -98,8 +98,8 @@ class UpdateShopRequest(BaseModel, BaseSdkModel):
         if value is None:
             return value
 
-        if value not in set(['UMI', 'UKE', 'UME', 'UBE']):
-            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE')")
+        if value not in set(['UMI', 'UKE', 'UME', 'UBE', 'URE']):
+            raise ValueError("must be one of enum values ('UMI', 'UKE', 'UME', 'UBE', 'URE')")
         return value
 
     @field_validator('loyalty')

{dana_python-2.1.7 → dana_python-2.1.9}/dana/webhook/shop_info.py

@@ -36,7 +36,7 @@ class ShopInfo(BaseModel, BaseSdkModel):
     shop_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Information of shop identifier. Required if externalShopId is blank")
     external_shop_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Information of external shop identifier. Required if shopId is blank")
     operator_id: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Information of operator identifier")
-    shop_address: Optional[Annotated[str, Field(strict=True, max_length=256)]] = Field(default=None, description="Information of shop address")
+    shop_address: Optional[str] = Field(default=None, description="Information of shop address")
     division_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Information of division identifier")
     external_division_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Information of external division identifier")
     division_type: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Information of division type")

{dana_python-2.1.7 → dana_python-2.1.9}/dana/webhook/webhook.py

@@ -141,6 +141,27 @@ class WebhookParser:
         except Exception as e:
             return "", Exception(f"MinifyJSON: failed to marshal JSON for minification: {e}")
 
+    @staticmethod
+    def _has_triple_escaped_json_string_field(json_str: str) -> bool:
+        return '":"{\\\\\\"' in json_str
+
+    @staticmethod
+    def _process_over_escaped_minified_json(json_str: str) -> str:
+        normalized = json_str.replace('\\\\"', '"')
+        return WebhookParser._process_nested_json_fields(normalized)
+
+    @staticmethod
+    def _process_nested_json_fields(json_str: str) -> str:
+        normalized_str = json_str.replace('\\\\"', '\\"')
+
+        def replace_func(match):
+            field_name = match.group(1)
+            json_value = match.group(2)
+            escaped_value = json_value.replace('"', '\\"')
+            return f'"{field_name}":"{escaped_value}"'
+
+        return re.sub(r'"(\w+)":"(\{.*?\})"', replace_func, normalized_str)
+
     @staticmethod
     def _ensure_minified_json(json_str: str) -> tuple[str, Exception]:
         """
@@ -148,27 +169,109 @@ class WebhookParser:
         Returns tuple of (minified_json, error)
         """
         try:
-            normalized_str = json_str.replace('\\"', '"')
-            
-            pattern = r'"(\w+)":"(\{.*?\})"'
-            def replace_func(match):
-                field_name = match.group(1)
-                json_value = match.group(2)
-                escaped_value = json_value.replace('"', '\\"')
-                return f'"{field_name}":"{escaped_value}"'
-            
-            processed_str = re.sub(pattern, replace_func, normalized_str)
-            
+            if WebhookParser._is_json_minified(json_str) and not WebhookParser._has_triple_escaped_json_string_field(json_str):
+                return json_str, None
+
+            if WebhookParser._is_json_minified(json_str):
+                return WebhookParser._process_over_escaped_minified_json(json_str), None
+
+            normalized_str = json_str.replace('\\\\"', '\\"')
+            processed_str = WebhookParser._process_nested_json_fields(normalized_str)
+
             if WebhookParser._is_json_minified(processed_str):
                 return processed_str, None
-            
+
             return WebhookParser._minify_json(processed_str)
-            
+
         except json.JSONDecodeError as e:
             return "", Exception(f"EnsureMinifiedJSON: failed to unmarshal JSON: {e}")
         except Exception as e:
             return "", Exception(f"EnsureMinifiedJSON: failed to marshal JSON for minification: {e}")
 
+    @staticmethod
+    def _is_valid_json(json_str: str) -> bool:
+        try:
+            json.loads(json_str)
+            return True
+        except json.JSONDecodeError:
+            return False
+
+    @staticmethod
+    def _collapse_triple_backslash_quotes(s: str) -> str:
+        if '\\\\\\"' not in s:
+            return s
+        return s.replace('\\\\\\"', '\\"')
+
+    @staticmethod
+    def _collapse_double_backslash_quotes(s: str) -> str:
+        if '\\\\"' not in s:
+            return s
+        return s.replace('\\\\"', '"')
+
+    @staticmethod
+    def _remove_colon_space_before_quoted_value(s: str) -> str:
+        if ': \\"' not in s:
+            return s
+        return s.replace(': \\"', ':\\"')
+
+    @staticmethod
+    def _normalize_over_escaped_quotes(s: str) -> str:
+        if '\\\\"' in s:
+            return s.replace('\\\\"', '\\"')
+        return s
+
+    @staticmethod
+    def _body_forms_for_signature(request_body: str) -> list[str]:
+        seen: set[str] = set()
+        forms: list[str] = []
+
+        def add(form: str) -> None:
+            if form and form not in seen:
+                seen.add(form)
+                forms.append(form)
+
+        collapsed = WebhookParser._collapse_triple_backslash_quotes(request_body)
+        if collapsed != request_body and WebhookParser._is_valid_json(collapsed):
+            add(collapsed)
+
+        collapsed_spaced = WebhookParser._remove_colon_space_before_quoted_value(collapsed)
+        if collapsed_spaced != request_body and WebhookParser._is_valid_json(collapsed_spaced):
+            add(collapsed_spaced)
+
+        collapsed = WebhookParser._collapse_double_backslash_quotes(request_body)
+        if collapsed != request_body and WebhookParser._is_valid_json(collapsed):
+            add(collapsed)
+
+        spaced = WebhookParser._remove_colon_space_before_quoted_value(request_body)
+        if spaced != request_body and WebhookParser._is_valid_json(spaced):
+            add(spaced)
+
+        collapsed = WebhookParser._collapse_triple_backslash_quotes(spaced)
+        if collapsed != request_body and WebhookParser._is_valid_json(collapsed):
+            add(collapsed)
+
+        if WebhookParser._is_valid_json(request_body):
+            add(request_body)
+
+        normalized = WebhookParser._normalize_over_escaped_quotes(request_body)
+        if normalized != request_body and WebhookParser._is_json_minified(normalized) and WebhookParser._is_valid_json(normalized):
+            add(normalized)
+
+        nested_processed = WebhookParser._process_nested_json_fields(request_body)
+        if nested_processed != request_body:
+            add(nested_processed)
+
+        minified, err = WebhookParser._ensure_minified_json(request_body)
+        if err:
+            if not forms:
+                raise ValueError("failed to prepare any signature body form") from err
+        else:
+            add(minified)
+
+        if not forms:
+            raise ValueError("failed to prepare any signature body form")
+        return forms
+
     @staticmethod
     def _sha256_lower_hex(data: str) -> str:
         return hashlib.sha256(data.encode("utf-8")).hexdigest()
@@ -179,13 +282,38 @@ class WebhookParser:
         relative_path_url: str,
         body: str,
         x_timestamp: str
-    ) -> tuple[str, Exception]:
-        processed_body, err = self._ensure_minified_json(body)
-        if err:
-            return "", Exception(f"_construct_string_to_verify: failed to ensure JSON is minified: {err}")
-        
-        body_hash = self._sha256_lower_hex(processed_body)
-        return f"{http_method}:{relative_path_url}:{body_hash}:{x_timestamp}", None
+    ) -> str:
+        path = relative_path_url if relative_path_url.startswith("/") else f"/{relative_path_url}"
+        body_hash = self._sha256_lower_hex(body)
+        return f"{http_method.upper()}:{path}:{body_hash}:{x_timestamp}"
+
+    def _verify_signature(
+        self,
+        http_method: str,
+        relative_path_url: str,
+        body: str,
+        x_timestamp: str,
+        x_signature: str,
+    ) -> None:
+        body_forms = self._body_forms_for_signature(body)
+        signature_bytes = base64.b64decode(x_signature)
+
+        for body_form in body_forms:
+            string_to_verify = self._construct_string_to_verify(
+                http_method, relative_path_url, body_form, x_timestamp
+            )
+            try:
+                self.public_key.verify(
+                    signature_bytes,
+                    string_to_verify.encode("utf-8"),
+                    padding.PKCS1v15(),
+                    hashes.SHA256(),
+                )
+                return
+            except InvalidSignature:
+                continue
+
+        raise ValueError("Signature verification failed.")
 
     def parse_webhook(
         self,
@@ -200,33 +328,33 @@ class WebhookParser:
         if not x_signature or not x_timestamp:
             raise ValueError("Missing X-SIGNATURE or X-TIMESTAMP header.")
 
-        string_to_verify, err = self._construct_string_to_verify(
-            http_method=http_method,
-            relative_path_url=relative_path_url,
-            body=body,
-            x_timestamp=x_timestamp
-        )
-        if err:
-            raise ValueError(str(err))
-        signature_bytes = base64.b64decode(x_signature)
-        try:
-            self.public_key.verify(
-                signature_bytes,
-                string_to_verify.encode('utf-8'),
-                padding.PKCS1v15(),
-                hashes.SHA256()
-            )
-        except InvalidSignature:
-            raise ValueError("Signature verification failed.")
+        self._verify_signature(http_method, relative_path_url, body, x_timestamp, x_signature)
+
+        # Try multiple body transformations for parsing in order of likelihood:
+        # 1. Collapsed triple-backslash form (handles over-escaped \\\" → \")
+        # 2. Process nested JSON fields (handles bare-quote inner JSON like "field":"{...}")
+        # 3. ensureMinifiedJson fallback for pretty-printed bodies
+        payload_dict = None
+        for candidate in [
+            self._collapse_triple_backslash_quotes(body),
+            self._process_nested_json_fields(body),
+        ]:
+            try:
+                payload_dict = json.loads(candidate)
+                break
+            except json.JSONDecodeError:
+                continue
+
+        if payload_dict is None:
+            processed_body, err = self._ensure_minified_json(body)
+            if err:
+                raise ValueError(f"Failed to process JSON body: {err}")
+            try:
+                payload_dict = json.loads(processed_body)
+            except json.JSONDecodeError:
+                raise ValueError("Invalid JSON in request body.")
 
-        processed_body, err = self._ensure_minified_json(body)
-        if err:
-            raise ValueError(f"Failed to process JSON body: {err}")
-            
         try:
-            payload_dict = json.loads(processed_body)
             return FinishNotifyRequest.from_dict(payload_dict)
-        except json.JSONDecodeError:
-            raise ValueError("Invalid JSON in request body.")
         except Exception as e:
             raise ValueError(f"Failed to parse body into FinishNotifyRequest: {e}")

{dana_python-2.1.7 → dana_python-2.1.9/dana_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.1.7
+Version: 2.1.9
 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>

{dana_python-2.1.7 → dana_python-2.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dana-python"
-version = "2.1.7"
+version = "2.1.9"
 readme = "README.md"
 description = "API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs"
 license = "Apache-2.0"

{dana_python-2.1.7 → dana_python-2.1.9}/tests/test_disbursement_api.py

@@ -39,6 +39,7 @@ from tests.fixtures.disbursement import (
     get_transfer_to_bank_inquiry_status_request,
     get_transfer_to_dana_inquiry_status_request
 )
+from tests.helpers.disbursement_customer_retry import with_customer_number_retry
 
 
 class TestDisbursementApi:
@@ -47,11 +48,16 @@ class TestDisbursementApi:
     def test_dana_account_inquiry_success(self, api_instance_disbursement: DisbursementApi):
         """Should give success response and validate DANA account inquiry functionality"""
         
-        # Arrange
         request = get_dynamic_dana_account_inquiry_request()
-        
-        # Act
-        api_response = api_instance_disbursement.dana_account_inquiry(request)
+        partner_reference_no = request.partner_reference_no
+
+        def run(customer_number: str):
+            attempt = get_dynamic_dana_account_inquiry_request()
+            attempt.partner_reference_no = partner_reference_no
+            attempt.customer_number = customer_number
+            return api_instance_disbursement.dana_account_inquiry(attempt)
+
+        api_response, _ = with_customer_number_retry(run)
         
         # Assert - Check response structure and required fields
         assert isinstance(api_response, DanaAccountInquiryResponse)
@@ -80,10 +86,7 @@ class TestDisbursementApi:
     def test_bank_account_inquiry_success(self, api_instance_disbursement: DisbursementApi):
         """Should give success response and validate bank account inquiry functionality"""
         
-        # Arrange
         request = get_dynamic_bank_account_inquiry_request()
-        
-        # Act
         api_response = api_instance_disbursement.bank_account_inquiry(request)
         
         # Assert - Check response structure and required fields
@@ -160,11 +163,16 @@ class TestDisbursementApi:
     def test_transfer_to_dana_success(self, api_instance_disbursement: DisbursementApi):
         """Should successfully perform transfer to DANA operation"""
         
-        # Arrange
         request = get_dynamic_transfer_to_dana_request()
-        
-        # Act
-        api_response = api_instance_disbursement.transfer_to_dana(request)
+        partner_reference_no = request.partner_reference_no
+
+        def run(customer_number: str):
+            attempt = get_dynamic_transfer_to_dana_request()
+            attempt.partner_reference_no = partner_reference_no
+            attempt.customer_number = customer_number
+            return api_instance_disbursement.transfer_to_dana(attempt)
+
+        api_response, _ = with_customer_number_retry(run)
         
         # Assert
         assert isinstance(api_response, TransferToDanaResponse)
@@ -179,13 +187,20 @@ class TestDisbursementApi:
     def test_transfer_to_dana_inquiry_status_success(self, api_instance_disbursement: DisbursementApi):
         """Should successfully inquire transfer to DANA status"""
         
-        # Arrange - First perform a transfer to DANA to get a valid reference
         transfer_request = get_dynamic_transfer_to_dana_request()
-        transfer_response = api_instance_disbursement.transfer_to_dana(transfer_request)
-        
+        partner_reference_no = transfer_request.partner_reference_no
+
+        def run_transfer(customer_number: str):
+            attempt = get_dynamic_transfer_to_dana_request()
+            attempt.partner_reference_no = partner_reference_no
+            attempt.customer_number = customer_number
+            return api_instance_disbursement.transfer_to_dana(attempt)
+
+        transfer_response, _ = with_customer_number_retry(run_transfer)
+
         # Create inquiry status request using the transfer response
         inquiry_request = get_transfer_to_dana_inquiry_status_request(
-            transfer_response.partner_reference_no
+            transfer_response.partner_reference_no or partner_reference_no
         )
         
         # Wait a bit before checking status