dana-python 2.2.2__tar.gz → 3.0.0__tar.gz

{dana_python-2.2.2/dana_python.egg-info → dana_python-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.2.2
+Version: 3.0.0
 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>
@@ -8,19 +8,16 @@ License-Expression: Apache-2.0
 Project-URL: homepage, https://dashboard.dana.id/api-docs
 Project-URL: repository, https://github.com/dana-id/dana-python
 Keywords: DANA,DANA ID Docs,DANA SDK,DANA Python,DANA API Client,DANA Python API Client,DANA Python SDK
-Requires-Python: >3.9.1
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: annotated-types==0.7.0
-Requires-Dist: cffi==2.0.0
-Requires-Dist: cryptography<46.0.0,>=44.0.2
-Requires-Dist: pycparser==2.23
+Requires-Dist: annotated-types>=0.7.0
+Requires-Dist: cryptography>=50.0.0
 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
-Requires-Dist: six==1.17.0
+Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: typing-extensions<5.0.0,>=4.12.2
-Requires-Dist: urllib3<3.0.0,>=2.3.0
+Requires-Dist: urllib3<3.0.0,>=2.8.0
 Dynamic: license-file
 
 # dana-python
@@ -62,7 +59,7 @@ Here is the link: https://github.com/dana-id/uat-script.
 
 ## Requirements.
 
-Python 3.9.1+
+Python 3.10+ (patched releases: 3.11.17, 3.12.15, 3.13.17, 3.14.9, 3.15.1 or later)
 
 ## Installation & Usage
 ### pip install

{dana_python-2.2.2 → dana_python-3.0.0}/README.md

@@ -37,7 +37,7 @@ Here is the link: https://github.com/dana-id/uat-script.
 
 ## Requirements.
 
-Python 3.9.1+
+Python 3.10+ (patched releases: 3.11.17, 3.12.15, 3.13.17, 3.14.9, 3.15.1 or later)
 
 ## Installation & Usage
 ### pip install

{dana_python-2.2.2 → dana_python-3.0.0}/dana/utils/snap_configuration.py

@@ -231,9 +231,9 @@ class SnapConfiguration(BaseConfiguration):
     ) -> None:
         """Constructor
         """
-        self.host = "http://api.sandbox.dana.id" if (api_key["DANA_ENV"] == Env.SANDBOX or api_key["ENV"] == Env.SANDBOX) else \
+        self.host = "https://api.sandbox.dana.id" if (api_key["DANA_ENV"] == Env.SANDBOX or api_key["ENV"] == Env.SANDBOX) else \
         "https://api.saas.dana.id" if (api_key["DANA_ENV"] == Env.PRODUCTION or api_key["ENV"] == Env.PRODUCTION) else None
-        self._base_path = "http://api.sandbox.dana.id" if (api_key["DANA_ENV"] == Env.SANDBOX or api_key["ENV"] == Env.SANDBOX) else \
+        self._base_path = "https://api.sandbox.dana.id" if (api_key["DANA_ENV"] == Env.SANDBOX or api_key["ENV"] == Env.SANDBOX) else \
         "https://api.saas.dana.id" if (api_key["DANA_ENV"] == Env.PRODUCTION or api_key["ENV"] == Env.PRODUCTION) else None
         """Default Base url
         """
@@ -595,7 +595,7 @@ class SnapConfiguration(BaseConfiguration):
 
         host_settings = [
             {
-                'url': "http://api.sandbox.dana.id",
+                'url': "https://api.sandbox.dana.id",
                 'description': "No description provided",
             }
         ] if (self.api_key["DANA_ENV"] == Env.SANDBOX or self.api_key["ENV"] == Env.SANDBOX) else [

{dana_python-2.2.2 → dana_python-3.0.0}/dana/webhook/webhook.py

@@ -25,7 +25,7 @@ from cryptography.hazmat.primitives.asymmetric import padding
 
 from dana.webhook.finish_notify_request import FinishNotifyRequest
 
-# Sandbox gateway public key used for webhook signature verification when DANA_ENV/ENV is sandbox.
+# Sandbox gateway public key used for webhook signature verification only when DANA_ENV/ENV is explicitly sandbox.
 SANDBOX_WEBHOOK_PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnaKVGRbin4Wh4KN35OPh
 ytJBjYTz7QZKSZjmHfiHxFmulfT87rta+IvGJ0rCBgg+1EtKk1hX8G5gPGJs1htJ
@@ -37,9 +37,41 @@ X6JV1OSST1C9sbPGzMHZ8AGB51BM0mok7davD/5irUk+f0C25OgzkwtxAt80dkDo
 -----END PUBLIC KEY-----"""
 
 
+def resolve_webhook_key_content(public_key=None, public_key_path=None) -> str:
+    """
+    Selects the webhook public key content.
+
+    The sandbox key is used only when the environment is explicitly sandbox
+    (first non-empty of DANA_ENV, ENV, trimmed and lower-cased). In any other
+    case, including when neither variable is set, the supplied key is used:
+    public_key_path first, then public_key.
+
+    Raises:
+        ValueError: If no key is available or the key file cannot be read.
+    """
+    env = (os.getenv("DANA_ENV") or os.getenv("ENV") or "").strip().lower()
+    if env == "sandbox":
+        return SANDBOX_WEBHOOK_PUBLIC_KEY
+    if public_key_path:
+        try:
+            return Path(public_key_path).read_text().strip()
+        except Exception as e:
+            raise ValueError(f"Failed to read key from file path '{public_key_path}': {e}")
+    if public_key:
+        return public_key.strip()
+    raise ValueError(
+        "Either 'public_key' or 'public_key_path' must be provided. "
+        "In production, pass your DANA public key via 'public_key' or 'public_key_path'. "
+        "Set DANA_ENV=sandbox to use the built-in sandbox key."
+    )
+
+
 class WebhookParser:
     """
-    Verifies incoming webhook signatures and parse webhook request into FinishNotifyRequest object
+    Verifies incoming webhook signatures and parse webhook request into FinishNotifyRequest object.
+
+    The built-in sandbox key is used only when DANA_ENV (or ENV) is explicitly "sandbox";
+    otherwise the supplied public_key_path / public_key is required.
     """
     def __init__(self, public_key: str = None, public_key_path: str = None):
         """
@@ -48,23 +80,13 @@ class WebhookParser:
             public_key (str, optional): The public key as a string. Defaults to None.
             public_key_path (str, optional): Path to the public key PEM file. Defaults to None.
                                           If provided, this will be prioritized over public_key.
+            When DANA_ENV (or ENV) is "sandbox", the built-in sandbox key is used and both
+            arguments are ignored. For any other value, including unset, one of them is required.
         Raises:
-            ValueError: If neither public_key nor public_key_path is provided,
+            ValueError: If no key is available (and the environment is not sandbox),
                         if the key file cannot be read, or if the key format is invalid.
         """
-        key_input_content = ""
-        env = (os.getenv("DANA_ENV") or os.getenv("ENV") or "").strip().lower()
-        if env == "sandbox" or env == "":
-            key_input_content = SANDBOX_WEBHOOK_PUBLIC_KEY
-        elif public_key_path:
-            try:
-                key_input_content = Path(public_key_path).read_text().strip()
-            except Exception as e:
-                raise ValueError(f"Failed to read key from file path '{public_key_path}': {e}")
-        elif public_key:
-            key_input_content = public_key.strip()
-        else:
-            raise ValueError("Either 'public_key' or 'public_key_path' must be provided.")
+        key_input_content = resolve_webhook_key_content(public_key, public_key_path)
 
         if not key_input_content:
              raise ValueError("Key content is empty.")

{dana_python-2.2.2 → dana_python-3.0.0/dana_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.2.2
+Version: 3.0.0
 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>
@@ -8,19 +8,16 @@ License-Expression: Apache-2.0
 Project-URL: homepage, https://dashboard.dana.id/api-docs
 Project-URL: repository, https://github.com/dana-id/dana-python
 Keywords: DANA,DANA ID Docs,DANA SDK,DANA Python,DANA API Client,DANA Python API Client,DANA Python SDK
-Requires-Python: >3.9.1
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: annotated-types==0.7.0
-Requires-Dist: cffi==2.0.0
-Requires-Dist: cryptography<46.0.0,>=44.0.2
-Requires-Dist: pycparser==2.23
+Requires-Dist: annotated-types>=0.7.0
+Requires-Dist: cryptography>=50.0.0
 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
-Requires-Dist: six==1.17.0
+Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: typing-extensions<5.0.0,>=4.12.2
-Requires-Dist: urllib3<3.0.0,>=2.3.0
+Requires-Dist: urllib3<3.0.0,>=2.8.0
 Dynamic: license-file
 
 # dana-python
@@ -62,7 +59,7 @@ Here is the link: https://github.com/dana-id/uat-script.
 
 ## Requirements.
 
-Python 3.9.1+
+Python 3.10+ (patched releases: 3.11.17, 3.12.15, 3.13.17, 3.14.9, 3.15.1 or later)
 
 ## Installation & Usage
 ### pip install

{dana_python-2.2.2 → dana_python-3.0.0}/dana_python.egg-info/SOURCES.txt

@@ -237,12 +237,15 @@ dana_python.egg-info/SOURCES.txt
 dana_python.egg-info/dependency_links.txt
 dana_python.egg-info/requires.txt
 dana_python.egg-info/top_level.txt
+tests/test_dependency_floors.py
 tests/test_disbursement_api.py
 tests/test_disbursement_custom_validation_enrich.py
 tests/test_merchant_management_api.py
 tests/test_payment_gateway_api.py
 tests/test_payment_gateway_with_automation.py
+tests/test_snap_configuration.py
 tests/test_snap_header.py
 tests/test_webhook.py
+tests/test_webhook_key_selection.py
 tests/test_widget_api.py
 tests/test_widget_with_automation.py

dana_python-3.0.0/dana_python.egg-info/requires.txt

@@ -0,0 +1,7 @@
+annotated-types>=0.7.0
+cryptography>=50.0.0
+pydantic<3.0.0,>=2.10.6
+pydantic-core<3.0.0,>=2.27.2
+python-dateutil>=2.9.0.post0
+typing-extensions<5.0.0,>=4.12.2
+urllib3<3.0.0,>=2.8.0

{dana_python-2.2.2 → dana_python-3.0.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "dana-python"
-version = "2.2.2"
+version = "3.0.0"
 readme = "README.md"
 description = "API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs"
 license = "Apache-2.0"
-requires-python = ">3.9.1"
+requires-python = ">=3.10"
 authors = [
   { name = "DANA Package Manager ", email = "package-manager@dana.id" },
 ]
@@ -13,16 +13,13 @@ maintainers = [
 ]
 keywords = ["DANA", "DANA ID Docs", "DANA SDK", "DANA Python", "DANA API Client", "DANA Python API Client", "DANA Python SDK"]
 dependencies = [
-  "annotated-types==0.7.0",
-  "cffi==2.0.0",
-  "cryptography>=44.0.2,<46.0.0",
-  "pycparser==2.23",
+  "annotated-types>=0.7.0",
+  "cryptography>=50.0.0",
   "pydantic>=2.10.6,<3.0.0",
   "pydantic-core>=2.27.2,<3.0.0",
-  "python-dateutil==2.9.0.post0",
-  "six==1.17.0",
+  "python-dateutil>=2.9.0.post0",
   "typing-extensions>=4.12.2,<5.0.0",
-  "urllib3>=2.3.0,<3.0.0"
+  "urllib3>=2.8.0,<3.0.0"
 ]
 
 [project.urls]

dana_python-3.0.0/tests/test_dependency_floors.py

@@ -0,0 +1,25 @@
+from importlib.metadata import version
+try:
+    import tomllib  # 3.11+
+except ModuleNotFoundError:  # Python 3.10
+    import tomli as tomllib
+from pathlib import Path
+
+PYPROJECT = tomllib.loads((Path(__file__).parent.parent / "pyproject.toml").read_text())
+
+def _major_minor(v):
+    return tuple(int(p) for p in v.split(".")[:2])
+
+def test_requires_python_floor():
+    assert PYPROJECT["project"]["requires-python"] == ">=3.10"
+
+def test_cryptography_spec_has_floor_and_no_cap():
+    spec = next(d for d in PYPROJECT["project"]["dependencies"] if d.startswith("cryptography"))
+    assert spec == "cryptography>=50.0.0"
+
+def test_urllib3_spec():
+    assert "urllib3>=2.8.0,<3.0.0" in PYPROJECT["project"]["dependencies"]
+
+def test_installed_versions_are_patched():
+    assert _major_minor(version("cryptography")) >= (50, 0)
+    assert _major_minor(version("urllib3")) >= (2, 8)

dana_python-3.0.0/tests/test_snap_configuration.py

@@ -0,0 +1,15 @@
+from dana.utils.snap_configuration import SnapConfiguration, Env
+
+
+def _cfg(env):
+    return SnapConfiguration(api_key={"DANA_ENV": env, "ENV": None})
+
+
+def test_sandbox_host_is_https():
+    cfg = _cfg(Env.SANDBOX)
+    assert cfg.host == "https://api.sandbox.dana.id"
+    assert cfg.get_host_settings()[0]["url"] == "https://api.sandbox.dana.id"
+
+
+def test_production_host_unchanged():
+    assert _cfg(Env.PRODUCTION).host == "https://api.saas.dana.id"

{dana_python-2.2.2 → dana_python-3.0.0}/tests/test_webhook.py

@@ -14,13 +14,25 @@
 
 import json
 import os
+import pytest
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
 from dana.webhook.finish_notify_request import FinishNotifyRequest
 from dana.webhook import WebhookParser
+from dana.webhook.webhook import SANDBOX_WEBHOOK_PUBLIC_KEY
 from dana.utils.snap_header import SnapHeader
 # Import fixtures directly from their modules to avoid circular imports
 from tests.fixtures.api_client import api_instance_payment_gateway
 from tests.fixtures.payment_gateway import webhook_key_pair
 
+@pytest.fixture(autouse=True)
+def sandbox_webhook_key(monkeypatch):
+    """These payloads are signed with the sandbox gateway key, so select it explicitly
+    (an unset DANA_ENV no longer implies sandbox); monkeypatch restores the environment."""
+    monkeypatch.setenv("DANA_ENV", "sandbox")
+    monkeypatch.delenv("ENV", raising=False)
+
+
 class TestWebhookParser:
     def test_webhook_signature_and_parsing_success(self):
         # Load keys from environment variables
@@ -312,3 +324,57 @@ class TestWebhookParser:
         assert result.amount.value == "1000.00"
         assert result.latest_transaction_status == "00"
         assert result.transaction_status_desc == "SUCCESS"
+
+
+def _sandbox_signed_notification():
+    """The notification from test_webhook_signature_and_parsing_success, signed with the sandbox gateway key."""
+    return {
+        "http_method": "POST",
+        "relative_path_url": "/api/v2/test-notif/dana",
+        "headers": {
+            "Channel-Id": "DANA",
+            "Charset": "UTF-8",
+            "Content-Type": "application/json",
+            "User-Agent": "Jakarta Commons-HttpClient/3.1",
+            "X-External-Id": "cFQ0PK5yS9wkMTMOVem4fIoUuyuA28jg",
+            "X-Partner-Id": "2025090110410957288340",
+            "X-Signature": "d/7mle7A+FCl4zvBZ2dMr3s7TVbbaK+toMtZwoev4OmLhn6Ctz/ynMaL3m3vHjAmV3UL3Fq5xp9thZFsO8BY74Vehqr1N9LQblV6i3TfMwT6lMvvhzWr0Fjbasyj23c5nFu1MOxpBiZFMMDNh8GQNLBAehHbjOmNldXSL6OQYRrK/TN9tdDyYFK6ltnKf4BN6bZa2ViAlI/np/U3QBW2LnDL82+8ZK7tYVF5bZyLLUSLXeWXBGQFTSDWqN+JdUHSnxGdQr3hZ7Y9Vqm/7G6rj6NrCxLPiEJYq1DQO3DjokMsORA2lOxzuo53bwqmhmD1mFhJKWF1JmyJuFdo2HB9JA==",
+            "X-Timestamp": "2025-09-16T12:11:30+07:00",
+        },
+        "body": '{"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"}',
+    }
+
+
+def _other_public_key_pem():
+    key = rsa.generate_private_key(public_exponent=65537, key_size=2048).public_key()
+    return key.public_bytes(serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo).decode()
+
+
+class TestWebhookParserOutsideSandbox:
+    """Outside an explicit sandbox environment the parser verifies against the supplied key,
+    so a sandbox-signed webhook is accepted only if the merchant supplied the sandbox key."""
+
+    @pytest.fixture(autouse=True)
+    def not_sandbox(self, monkeypatch):
+        monkeypatch.delenv("DANA_ENV", raising=False)
+        monkeypatch.delenv("ENV", raising=False)
+
+    def test_supplied_key_verifies_when_env_unset(self):
+        parser = WebhookParser(public_key=SANDBOX_WEBHOOK_PUBLIC_KEY)
+
+        result = parser.parse_webhook(**_sandbox_signed_notification())
+
+        assert result.original_partner_reference_no == "LINKIT25091757998646"
+
+    @pytest.mark.parametrize("env", [
+        {},
+        {"DANA_ENV": "production"},
+        {"DANA_ENV": "production", "ENV": "sandbox"},
+    ])
+    def test_sandbox_signed_webhook_rejected_with_merchant_key(self, monkeypatch, env):
+        for name, value in env.items():
+            monkeypatch.setenv(name, value)
+        parser = WebhookParser(public_key=_other_public_key_pem())
+
+        with pytest.raises(ValueError, match="Signature verification failed"):
+            parser.parse_webhook(**_sandbox_signed_notification())

dana_python-3.0.0/tests/test_webhook_key_selection.py

@@ -0,0 +1,35 @@
+import pytest
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization
+from dana.webhook.webhook import resolve_webhook_key_content, SANDBOX_WEBHOOK_PUBLIC_KEY
+
+def _pem():
+    k = rsa.generate_private_key(public_exponent=65537, key_size=2048).public_key()
+    return k.public_bytes(serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo).decode()
+
+@pytest.fixture(autouse=True)
+def _clear_env(monkeypatch):
+    monkeypatch.delenv("DANA_ENV", raising=False)
+    monkeypatch.delenv("ENV", raising=False)
+
+def test_env_unset_uses_supplied_key():
+    key = _pem()
+    assert resolve_webhook_key_content(key, None) == key.strip()
+
+def test_env_unset_without_key_raises():
+    with pytest.raises(ValueError, match="Set DANA_ENV=sandbox to use the built-in sandbox key."):
+        resolve_webhook_key_content(None, None)
+
+def test_explicit_sandbox_ignores_supplied_key(monkeypatch):
+    monkeypatch.setenv("DANA_ENV", " Sandbox ")
+    assert resolve_webhook_key_content(_pem(), None) == SANDBOX_WEBHOOK_PUBLIC_KEY
+
+def test_empty_dana_env_falls_through_to_env(monkeypatch):
+    monkeypatch.setenv("DANA_ENV", "")
+    monkeypatch.setenv("ENV", "sandbox")
+    assert resolve_webhook_key_content(_pem(), None) == SANDBOX_WEBHOOK_PUBLIC_KEY
+
+def test_production_uses_key_path_over_string(monkeypatch, tmp_path):
+    monkeypatch.setenv("DANA_ENV", "production")
+    path_key = _pem(); p = tmp_path / "k.pem"; p.write_text(path_key)
+    assert resolve_webhook_key_content(_pem(), str(p)) == path_key.strip()

dana_python-2.2.2/dana_python.egg-info/requires.txt

@@ -1,10 +0,0 @@
-annotated-types==0.7.0
-cffi==2.0.0
-cryptography<46.0.0,>=44.0.2
-pycparser==2.23
-pydantic<3.0.0,>=2.10.6
-pydantic-core<3.0.0,>=2.27.2
-python-dateutil==2.9.0.post0
-six==1.17.0
-typing-extensions<5.0.0,>=4.12.2
-urllib3<3.0.0,>=2.3.0