dana-python 2.2.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

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/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.dist-info → dana_python-3.0.0.dist-info}/METADATA

@@ -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.dist-info → dana_python-3.0.0.dist-info}/RECORD

@@ -152,7 +152,7 @@ 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=zel7LB6GmIGIFyaegYdtmGZj-0tcwe6xuTXvGz-8vLw,2480
-dana/utils/snap_configuration.py,sha256=MZy4dBydo1PqvcB8XVVTBysWdoPmQ8ct7Gzp7jIMFQA,21531
+dana/utils/snap_configuration.py,sha256=QBdAELaNQLT-BCRrZbQMaGse-WPMXWZXWJQIckyXTc4,21534
 dana/utils/snap_header.py,sha256=QE0Kbna1f2WEH5MknLKkWgLNbzdWEjF36DngKBcdXuA,13393
 dana/utils/url.py,sha256=wCDthoodIDANoth6SqSoiIdNwc-hJLNjFBdf_fSjU_4,1965
 dana/webhook/__init__.py,sha256=PGG-SGs96pn8aBTVhR9Xg4-DkIvsIRIdZfV57ZG1FwI,626
@@ -163,7 +163,7 @@ dana/webhook/finish_notify_response.py,sha256=9bHXP2TdU02GkOF8F-M6qF6ox-x2wBz6Nr
 dana/webhook/money.py,sha256=4o0oPAf7LnpVHX45yhqmXs5tg5PKlJ2B-OqfHi4aGQM,3413
 dana/webhook/pay_option_info.py,sha256=_IA3X04ZIBYsVfoe31w4tYvjz_klKb9GEWDXBoROrF4,8739
 dana/webhook/shop_info.py,sha256=a7ZsvGA10hao9qeazp5H6jjNt9J_uz9A6cdD5TZSNsU,4722
-dana/webhook/webhook.py,sha256=UyI2rOWZYj33kVXpzbjedTxYu2vO4YRUI_-PUVrSNjs,14918
+dana/webhook/webhook.py,sha256=abvxl0pESAvNSrm-cFKjXyquRfvSqrwC97VKTMjVWR0,15900
 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=XqQLJu3Dh5XdUpG5eXXSq8dYVymha3vDdpkoKjJ0E7U,7028
@@ -229,8 +229,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.2.2.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
-dana_python-2.2.2.dist-info/METADATA,sha256=O2b7-OHIQYqNUTk407-NKW3GqE4v29lWOd_nG6eq3hY,5568
-dana_python-2.2.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-dana_python-2.2.2.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
-dana_python-2.2.2.dist-info/RECORD,,
+dana_python-3.0.0.dist-info/licenses/LICENSE,sha256=7CXCr_1HV_P6dPKoffVsU3lk2eVjnRacBDnQIeJMgFc,10232
+dana_python-3.0.0.dist-info/METADATA,sha256=2fhWF0Jl7Bm6DAZbVCbvDY4FNkIU6mrhOjaO3zIOU8k,5545
+dana_python-3.0.0.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+dana_python-3.0.0.dist-info/top_level.txt,sha256=uvbw-Siay0DC-rXYYx11_k0lqDnrOl5tFeSkE-3Mb8I,5
+dana_python-3.0.0.dist-info/RECORD,,

{dana_python-2.2.2.dist-info → dana_python-3.0.0.dist-info}/WHEEL

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