dana-python 1.1.7__tar.gz → 1.1.9__tar.gz

{dana_python-1.1.7/dana_python.egg-info → dana_python-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 1.1.7
+Version: 1.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-1.1.7 → dana_python-1.1.9}/dana/webhook/webhook.py

@@ -16,6 +16,7 @@ import base64
 import hashlib
 import json
 import os
+import re
 
 from pathlib import Path
 from cryptography.exceptions import InvalidSignature
@@ -98,19 +99,60 @@ class WebhookParser:
             )
 
     @staticmethod
-    def _ensure_minified_json(json_str: str) -> tuple[str, Exception]:
+    def _is_json_minified(json_str: str) -> bool:
         """
-        Ensures JSON string is minified
-        Returns tuple of (minified_json, error)
+        Performs a quick heuristic check to see if JSON is already minified
+        """
+        indicators = [": ", ", ", "{ ", "[ ", "\n", "\t", "\r"]
+        
+        for indicator in indicators:
+            if indicator in json_str:
+                return False
+        
+        return True
+
+
+    @staticmethod
+    def _minify_json(json_str: str) -> tuple[str, Exception]:
+        """
+        Compacts a JSON string by removing unnecessary whitespace
         """
         try:
             obj = json.loads(json_str)
             minified = json.dumps(obj, separators=(",", ":"))
             return minified, None
         except json.JSONDecodeError as e:
-            return "", e
+            return "", Exception(f"MinifyJSON: failed to unmarshal JSON: {e}")
         except Exception as e:
-            return "", e
+            return "", Exception(f"MinifyJSON: failed to marshal JSON for minification: {e}")
+
+    @staticmethod
+    def _ensure_minified_json(json_str: str) -> tuple[str, Exception]:
+        """
+        Ensures JSON string is minified
+        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(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 _sha256_lower_hex(data: str) -> str:
@@ -123,11 +165,11 @@ class WebhookParser:
         body: str,
         x_timestamp: str
     ) -> tuple[str, Exception]:
-        minified_body, err = self._ensure_minified_json(body)
+        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(minified_body)
+        body_hash = self._sha256_lower_hex(processed_body)
         return f"{http_method}:{relative_path_url}:{body_hash}:{x_timestamp}", None
 
     def parse_webhook(
@@ -152,7 +194,6 @@ class WebhookParser:
         if err:
             raise ValueError(str(err))
         signature_bytes = base64.b64decode(x_signature)
-       
         try:
             self.public_key.verify(
                 signature_bytes,
@@ -163,8 +204,12 @@ class WebhookParser:
         except InvalidSignature:
             raise ValueError("Signature verification failed.")
 
+        processed_body, err = self._ensure_minified_json(body)
+        if err:
+            raise ValueError(f"Failed to process JSON body: {err}")
+            
         try:
-            payload_dict = json.loads(body)
+            payload_dict = json.loads(processed_body)
             return FinishNotifyRequest.from_dict(payload_dict)
         except json.JSONDecodeError:
             raise ValueError("Invalid JSON in request body.")

{dana_python-1.1.7 → dana_python-1.1.9}/dana/widget/v1/util.py

@@ -73,7 +73,7 @@ class Util:
         if mode == Mode.DEEPLINK:
             base_url = 'https://link.dana.id/bindSnap' if env.lower() == 'production' else 'https://m.sandbox.dana.id/n/link/binding'
         elif mode == Mode.API:
-            base_url = 'https://m.dana.id/n/ipg/oauth' if env.lower() == 'production' else 'https://m.sandbox.dana.id/n/ipg/oauth'
+            base_url = 'https://m.dana.id/v1.0/get-auth-code' if env.lower() == 'production' else 'https://m.sandbox.dana.id/v1.0/get-auth-code'
         
         # Get partner ID from environment
         partner_id = os.environ.get('X_PARTNER_ID')

{dana_python-1.1.7 → dana_python-1.1.9/dana_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 1.1.7
+Version: 1.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-1.1.7 → dana_python-1.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dana-python"
-version = "1.1.7"
+version = "1.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-1.1.7 → dana_python-1.1.9}/tests/test_webhook.py

@@ -29,7 +29,7 @@ class TestWebhookParser:
         webhook_http_method = "POST"
         webhook_relative_url = "/api/v2/test-notif/dana"
         
-        webhook_body_str = '{"amount":{"currency":"IDR","value":"100000.00"},"originalReferenceNo":"20250916111230999500166191900293793","merchantId":"216620080007039826152","latestTransactionStatus":"00","additionalInfo":{"paidTime":"1757998714761","paymentInfo":{"payOptionInfos":[{"transAmount":{"currency":"IDR","value":"100000.00"},"payAmount":{"currency":"IDR","value":"100000.00"},"payMethod":"NETWORK_PAY","payOption":"NETWORK_PAY_PG_LINKAJA"}],"extendInfo":"{\\"externalPromoInfos\\":[]}"}},"originalPartnerReferenceNo":"LINKIT25091757998646","createdTime":"1757998647000","finishedTime":"1757998714761","transactionStatusDesc":"SUCCESS"}'
+        webhook_body_str = '{"amount":{"currency":"IDR","value":"100000.00"},"originalReferenceNo":"20250916111230999500166191900293793","merchantId":"216620080007039826152","latestTransactionStatus":"00","additionalInfo":{"paidTime":"1757998714761","paymentInfo":{"payOptionInfos":[{"transAmount":{"currency":"IDR","value":"100000.00"},"payAmount":{"currency":"IDR","value":"100000.00"},"payMethod":"NETWORK_PAY","payOption":"NETWORK_PAY_PG_LINKAJA"}],"extendInfo":"{\"externalPromoInfos\":[]}"}},"originalPartnerReferenceNo":"LINKIT25091757998646","createdTime":"1757998647000","finishedTime":"1757998714761","transactionStatusDesc":"SUCCESS"}'
         
         x_timestamp = "2025-09-16T12:11:30+07:00"
         signature = "d/7mle7A+FCl4zvBZ2dMr3s7TVbbaK+toMtZwoev4OmLhn6Ctz/ynMaL3m3vHjAmV3UL3Fq5xp9thZFsO8BY74Vehqr1N9LQblV6i3TfMwT6lMvvhzWr0Fjbasyj23c5nFu1MOxpBiZFMMDNh8GQNLBAehHbjOmNldXSL6OQYRrK/TN9tdDyYFK6ltnKf4BN6bZa2ViAlI/np/U3QBW2LnDL82+8ZK7tYVF5bZyLLUSLXeWXBGQFTSDWqN+JdUHSnxGdQr3hZ7Y9Vqm/7G6rj6NrCxLPiEJYq1DQO3DjokMsORA2lOxzuo53bwqmhmD1mFhJKWF1JmyJuFdo2HB9JA=="
@@ -64,3 +64,48 @@ class TestWebhookParser:
         assert result.amount.value == "100000.00"
         assert result.amount.currency == "IDR"
         assert result.latest_transaction_status == "00"
+
+    def test_webhook_with_double_escaped_quotes(self):
+        """Test webhook parsing with double-escaped quotes in JSON (like PHP test)"""
+        # Load keys from environment variables
+        public_key = os.getenv("WEBHOOK_PUBLIC_KEY")
+        
+        webhook_http_method = "POST"
+        webhook_relative_url = "/d34021fa-7599-413b-8743-ddab605fea49"
+        
+        # This webhook body contains double-escaped quotes in extendInfo field
+        webhook_body_str = '{"amount":{"currency":"IDR","value":"50000.00"},"originalReferenceNo":"20251010111230999500166931000229476","merchantId":"216620090016041032029","latestTransactionStatus":"00","additionalInfo":{"paidTime":"2025-10-10T16:16:33+07:00","paymentInfo":{"payOptionInfos":[{"transAmount":{"currency":"IDR","value":"50000.00"},"payAmount":{"currency":"IDR","value":"50000.00"},"payMethod":"VIRTUAL_ACCOUNT","payOption":"VIRTUAL_ACCOUNT_BRI"}],"extendInfo":"{\\"externalPromoInfos\\":[]}"}},"originalPartnerReferenceNo":"ORDER-1760087736146","createdTime":"2025-10-10T16:15:37+07:00","finishedTime":"2025-10-10T16:16:33+07:00","transactionStatusDesc":"SUCCESS"}'
+        
+        x_timestamp = "2025-10-13T13:43:30+07:00"
+        signature = "fqrQPxlzEN4ZGW9vYt3PokmIrbG2HQtlbdj6krjf9HFW1qS3ilZjSR+9Z4XZNYxQIxyHHqXmjEiBU4ui/JrknSXlCpPQe7DztB/Ye+yLxIHYBnwdeCXn2zGGAV51nQki+eD2aL8Z6d6MyWz9hoytwE+jtWKUC0KtU7wQfoB0XjdEXzU3/4Ao/rWQbt97UONaaf7i5l3+M/ICP187PYw9iRHLUFh7WRPs8JKpZyO0kcJqEJbeOUjHMmIsLQImOlYVbQTM/1v89Ou1WcVAo0cXNE5yrvosB4pQROeI8KY2X1FNTuB1pdFtQTIyUcd/t1wuIxqHqqFKjrFdcQxlZOIyRg=="
+        
+        headers = {
+            "Channel-Id": "DANA",
+            "Charset": "UTF-8",
+            "Content-Type": "application/json",
+            "User-Agent": "Jakarta Commons-HttpClient/3.1",
+            "X-External-Id": "nXPTWcwt7lgCOy01wWGKDerEMlKwV5wc",
+            "X-Partner-Id": "2025091611385324660336",
+            "X-Signature": signature,
+            "X-Timestamp": x_timestamp
+        }
+        
+        # Create the parser with the public key
+        parser = WebhookParser(public_key=public_key)
+        
+        # Verify and parse - this should work with the JSON normalization
+        result = parser.parse_webhook(
+            http_method=webhook_http_method,
+            relative_path_url=webhook_relative_url,
+            headers=headers,
+            body=webhook_body_str
+        )
+        
+        # Verify specific fields like in the PHP test
+        assert result is not None
+        assert result.original_partner_reference_no == "ORDER-1760087736146"
+        assert result.original_reference_no == "20251010111230999500166931000229476"
+        assert result.merchant_id == "216620090016041032029"
+        assert result.amount.value == "50000.00"
+        assert result.amount.currency == "IDR"
+        assert result.latest_transaction_status == "00"