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

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

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

@@ -220,6 +220,14 @@ class WebhookParser:
             return s.replace('\\\\"', '\\"')
         return s
 
+    @staticmethod
+    def _remove_spaces_in_json_key_names(body: str) -> str:
+        return re.sub(
+            r'(\\*)"((?:\w+\s)+\w+)(\\*)"(\s*:)',
+            lambda m: m.group(1) + '"' + m.group(2).replace(' ', '') + m.group(3) + '"' + m.group(4),
+            body
+        )
+
     @staticmethod
     def _body_forms_for_signature(request_body: str) -> list[str]:
         seen: set[str] = set()
@@ -261,6 +269,16 @@ class WebhookParser:
         if nested_processed != request_body:
             add(nested_processed)
 
+        key_despace = WebhookParser._remove_spaces_in_json_key_names(request_body)
+        if key_despace != request_body:
+            add(key_despace)
+
+        key_despace_collapsed = WebhookParser._remove_spaces_in_json_key_names(
+            WebhookParser._collapse_triple_backslash_quotes(request_body)
+        )
+        if key_despace_collapsed != request_body:
+            add(key_despace_collapsed)
+
         minified, err = WebhookParser._ensure_minified_json(request_body)
         if err:
             if not forms:

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

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

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

@@ -39,7 +39,8 @@ class TestMerchantManagementApi:
     """Test class for Merchant Management API endpoints"""
     def test_create_shop_and_query_shop_success(self, api_instance_merchant_management: MerchantManagementApi, create_shop_request: CreateShopRequest, query_shop_request: QueryShopRequest):
         """Should successfully create a shop and return success response"""
-        
+        pytest.skip("Temporarily skipped")
+
         # Act
         api_response = api_instance_merchant_management.create_shop(create_shop_request)
         
@@ -87,6 +88,26 @@ class TestMerchantManagementApi:
             assert hasattr(query_shop_response.response.body, 'shop_resource_info')
             assert query_shop_response.response.body.shop_resource_info is not None
 
+    def test_query_shop_success(self, api_instance_merchant_management: MerchantManagementApi, query_shop_request: QueryShopRequest):
+        """Should successfully query a shop using a static shop ID"""
+        query_shop_request.shop_id = "216660000003429526679"
+
+        query_shop_response = api_instance_merchant_management.query_shop(query_shop_request)
+        print(f"Raw query shop response: {query_shop_response}")
+
+        assert query_shop_response is not None
+        assert hasattr(query_shop_response, 'response')
+        assert hasattr(query_shop_response.response, 'body')
+        assert hasattr(query_shop_response.response.body, 'result_info')
+
+        query_result_info = query_shop_response.response.body.result_info
+        assert query_result_info.result_status is not None
+        assert query_result_info.result_code is not None
+
+        if query_result_info.result_code == "SUCCESS":
+            assert hasattr(query_shop_response.response.body, 'shop_resource_info')
+            assert query_shop_response.response.body.shop_resource_info is not None
+
     def test_query_merchant_resource_success(self, api_instance_merchant_management: MerchantManagementApi, query_merchant_resource_request: QueryMerchantResourceRequest):
         """Should successfully query merchant resource and return balance information"""
         

{dana_python-2.1.9 → dana_python-2.1.10}/tests/test_webhook.py

@@ -273,3 +273,42 @@ class TestWebhookParser:
         assert result.amount.currency == "IDR"
         assert result.latest_transaction_status == "00"
         assert result.transaction_status_desc == "SUCCESS"
+
+    def test_production_qris_spaced_key_in_body(self):
+        """QRIS webhook body containing spaces inside JSON key names (e.g. 'c urrency', 'q rInfoCacheIndex').
+        Tests that the spaced-key normalisation strips the spaces before signature verification."""
+        public_key = os.getenv("WEBHOOK_PUBLIC_KEY")
+
+        webhook_http_method = "POST"
+        webhook_relative_url = "/v2/dana/callback-qris"
+
+        webhook_body_str = r'{"amount":{"currency":"IDR","value":"1000.00"},"originalReferenceNo":"20260615111212800100166774003221871","merchantId":"216620040007047069653","latestTransactionStatus":"00","addi tionalInfo":{"shopInfo":{"externalShopId":"a9ab9ac5","shopName":"PT REKA MIKRO MOBILITAS","shopId":"216660000003346861448","shopAddress":"{\"address1\":\"a9ab9ac5\",\"address2\":\"a9ab9ac5\",\"area\":\"Abiansemal\",\"city\":\"Kab. Badung\",\"contactAddressId\":\"120100000003577990444\",\"contactAddressType\":\"OFFICE_ADD\",\"country\":\"Indonesia\",\"defaultAddress\":false,\"province\":\"Bali\",\"verified\":true,\"zipcode\":\"80351\"}"},"tipsAmount":{"amount":"0.0","centFactor":"100","cent":"0","currencyValue":"360","currency":"IDR","currencyCode":"IDR"},"extendInfo":"{\"payment_scene\":\"C_SCAN_B\",\"QR_TYPE\":\"QR_DYNAMIC\",\"externalShopId\":\"a9ab9ac5\",\"osType\":\"android\",\"sourcePlatform\":\"MAIN_APP\",\"billNumber\":\"TRX20260615cd1772\"}","paymentInfo":{"payOptionInfos":[{"transAmount":{"currency":"IDR","value":"1000.00"},"payAmount":{"currency":"IDR","value":"1000.00"},"payMethod":"BALANCE","chargeAmount":{"currency":"IDR","value":"0.00"},"extendInfo":"{}","payOptionBillExtendInfo":"{}"}],"cashierRequestId":"413d8c580ebb8c5aaff235ddc14e7274","paidTime":"2026-06-15T10:56:17+07:00","payRequestExtendInfo":"{\"payment_scene\":\"C_SCAN_B\",\"supportNewCashierFlow\":\"false\",\"EMVCO_CODE_INFO\":\"{\\\"acquiringBankName\\\":\\\"DANA\\\",\\\"additionalInfo\\\":{\\\"billNumber\\\":\\\"TRX20260615cd1772\\\",\\\"terminalLabel\\\":\\\"MER2026042717424830271473\\\"},\\\"countryCode\\\":\\\"ID\\\",\\\"creditAccountInfos\\\":[],\\\"extendInfo\\\":{},\\\"externalSerialNo\\\":\\\"774003221871\\\",\\\"gpnMerchantId\\\":\\\"216660000003346861448-a9ab9ac5\\\",\\\"instId\\\":\\\"DANA\\\",\\\"merchantCity\\\":\\\"Kab. Badung\\\",\\\"merchantNameLocation\\\":\\\"PT REKA MIKRO MOBILITAS\\\",\\\"merchantPan\\\":\\\"936009150002729888\\\",\\\"merchantPanLuhn\\\":\\\"9360091500027298882\\\",\\\"merchantType\\\":\\\"PSO\\\",\\\"onUs\\\":true,\\\"postalCode\\\":\\\"80351\\\",\\\"q rInfoCacheIndex\\\":\\\"MO_EMVCO_PARSE_CACHEGZ009D65D35EC9C4444699D3EE332B431E35danabizpluginGZ001781495773115\\\",\\\"trxCode\\\":\\\"Payment Credit\\\",\\\"trxFeeAmount\\\":{\\\"amount\\\":0.00,\\\"cent\\\":0,\\\"centFactor\\\":100,\\\"currency\\\":\\\"IDR\\\",\\\"currencyCode\\\":\\\"IDR\\\",\\\"currencyValue\\\":\\\"360\\\"}}\",\"isClientSupportFaceAuth\":\"false\",\"callbackClientVersion\":\"2.1\",\"passThroughToPromotion\":\"{\\\"ORDER_TITLE\\\":\\\"Pay to PT REKA MIKRO MOBILITAS\\\",\\\"gpnMerchantId\\\":\\\"216660000003346861448-a9ab9ac5\\\",\\\"CLIENT_ID\\\":\\\"2026042717424830271473\\\",\\\"SHOP_INFO\\\":\\\"{\\\\\\\"externalShopId\\\\\\\":\\\\\\\"a9ab9ac5\\\\\\\",\\\\\\\"mccCodes\\\\\\\":[\\\\\\\"4789\\\\\\\"],\\\\\\\"shopAddress\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"address1\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"a9ab9ac5\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"address2\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"a9ab9ac5\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"area\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"Abiansemal\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"city\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"Kab. Badung\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"contactAddressId\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"120100000003577990444\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"contactAddressType\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"OFFICE_ADD\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"country\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"Indonesia\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"defaultAddress\\\\\\\\\\\\\\\":false,\\\\\\\\\\\\\\\"province\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"Bali\\\\\\\\\\\\\\\",\\\\\\\\\\\\\\\"verified\\\\\\\\\\\\\\\":true,\\\\\\\\\\\\\\\"zipcode\\\\\\\\\\\\\\\":\\\\\\\\\\\\\\\"80351\\\\\\\\\\\\\\\"}\\\\\\\",\\\\\\\"shopId\\\\\\\":\\\\\\\"216660000003346861448\\\\\\\",\\\\\\\"shopName\\\\\\\":\\\\\\\"PT REKA MIKRO MOBILITAS\\\\\\\"}\\\"}\",\"orderStatus\":\"INIT\",\"SERVICE_INFO\":\"null\",\"isFrictionless\":\"false\",\"passToFluxnet\":\"{\\\"onUs\\\":\\\"true\\\",\\\"merchantName\\\":\\\"PT REKA MIKRO MOBILITAS\\\"}\",\"CHARGE_USER_FEE_INFO\":\"[]\",\"merchantCategoryCode\":\"4789\",\"externalShopId\":\"a9ab9ac5\",\"merchantCategoryName\":\"TRANSPORTATION SERVICES (NOT ELSEWHERE CLASSIFIED)\",\"needAmlCheck\":\"false\",\"billNumber\":\"TRX20260615cd1772\",\"passThroughToRisk\":\"{\\\"isModifySmartpay\\\":\\\"false\\\",\\\"passkeys\\\":\\\"false\\\",\\\"isPasskeysSupported\\\":\\\"false\\\",\\\"isSupportWAOtp\\\":\\\"true\\\",\\\"isFrictionless\\\":\\\"false\\\",\\\"payerTypingChallenge\\\":\\\"false\\\"}\",\"SUPPORT_FRICTIONLESS\":\"false\"}","extendInfo":"{\"topupAndPay\":\"false\",\"paymentStatus\":\"SUCCESS\"}"}},"externalStoreID":"a9ab9ac5","originalPartnerReferenceNo":"TRX20260615cd1772","finishedTime":"2026-06-15T10:56:17+07:00","createdTime":"2026-06-15T10:56:13+07:00","transactionStatusDesc":"SUCCESS"}'
+
+        x_timestamp = "2026-06-15T11:09:00+07:00"
+        signature = "ZR3ZYxx2MDn5qocjcLxu7eEzJxOQ7NpYryG19/sSS1CdjeBQuedw2G9zc9BjMuNQiMFXscxCqQqNbKl64r2x2Dur51FVReFlUUKUw0WiZNQr+EqN/A+3Vk8lJ74SeBErd8IflKO6KZ1zt97Ab0YSxlCJ0GH8fVwSiqZINbtbMq4gEuYu0n0mJ2zc2/gn4weyKIctosmL3ygm0VU+gUmU1+zopt1K4Q0umRiW3LqwLNC96Tk1iYFVsJuCu+8KcHYT88DPhwXdTjwrXydIqIF3oyqpMHyBRAX1za7Q6z5Zsv8or3glwWNexfmNBg9GiwpKjHWPIrGqtbj1zo3KbRvFCQ=="
+
+        headers = {
+            "Channel-Id": "DANA",
+            "Charset": "UTF-8",
+            "Content-Type": "application/json",
+            "User-Agent": "Jakarta Commons-HttpClient/3.1",
+            "X-Partner-Id": "2026042717424830271473",
+            "X-Signature": signature,
+            "X-Timestamp": x_timestamp,
+        }
+
+        parser = WebhookParser(public_key=public_key)
+        result = parser.parse_webhook(
+            http_method=webhook_http_method,
+            relative_path_url=webhook_relative_url,
+            headers=headers,
+            body=webhook_body_str,
+        )
+
+        assert result is not None
+        assert result.original_partner_reference_no == "TRX20260615cd1772"
+        assert result.original_reference_no == "20260615111212800100166774003221871"
+        assert result.merchant_id == "216620040007047069653"
+        assert result.amount.value == "1000.00"
+        assert result.latest_transaction_status == "00"
+        assert result.transaction_status_desc == "SUCCESS"