dana-python 1.1.0__tar.gz → 1.1.1__tar.gz

{dana_python-1.1.0/dana_python.egg-info → dana_python-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 1.1.0
+Version: 1.1.1
 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>
@@ -13,14 +13,14 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: annotated-types==0.7.0
 Requires-Dist: cffi==1.17.1
-Requires-Dist: cryptography==44.0.2
+Requires-Dist: cryptography<46.0.0,>=44.0.2
 Requires-Dist: pycparser==2.22
-Requires-Dist: pydantic==2.10.6
-Requires-Dist: pydantic-core==2.27.2
+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: typing-extensions==4.12.2
-Requires-Dist: urllib3==2.3.0
+Requires-Dist: typing-extensions<5.0.0,>=4.12.2
+Requires-Dist: urllib3<3.0.0,>=2.3.0
 Dynamic: license-file
 
 # dana-python

{dana_python-1.1.0 → dana_python-1.1.1}/dana/disbursement/v1/enum.py

@@ -62,6 +62,7 @@ class PayMethod(str, Enum):
     ONLINE_CREDIT = "ONLINE_CREDIT"
     LOAN_CREDIT = "LOAN_CREDIT"
     NETWORK_PAY = "NETWORK_PAY"
+    CARD = "CARD"
 
 class PayMethod(str, Enum):
     BALANCE = "BALANCE"

{dana_python-1.1.0 → dana_python-1.1.1}/dana/disbursement/v1/models/dana_account_inquiry_response.py

@@ -34,7 +34,7 @@ import json
 from dana.base.model import BaseSdkModel
 
 from pydantic import BaseModel, ConfigDict, Field
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from dana.disbursement.v1.models.money import Money
 from typing import Optional, Set
@@ -53,14 +53,14 @@ class DanaAccountInquiryResponse(BaseModel, BaseSdkModel):
     session_id: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="Session identifier")
     customer_number: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Customer account number, in format 628xxx")
     customer_name: Annotated[str, Field(strict=True, max_length=255)] = Field(description="Customer account name")
-    customer_monthly_limit: Optional[Union[Annotated[float, Field(le=100000000000000000, strict=True)], Annotated[int, Field(le=2147483647, strict=True)]]] = Field(default=None, description="Limitation of transfer to DANA balance for customer per month")
+    customer_monthly_in_limit: Optional[Annotated[str, Field(strict=True, max_length=17)]] = Field(default=None, description="Limitation of transfer to DANA balance for customer per month")
     min_amount: Money = Field(description="Minimal amount. Contains two sub-fields:<br> 1. Value: Amount, including the cents<br> 2. Currency: Currency code based on ISO ")
     max_amount: Money = Field(description="Maximal amount. Contains two sub-fields:<br> 1. Value: Amount, including the cents<br> 2. Currency: Currency code based on ISO ")
     amount: Money = Field(description="Amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO ")
     fee_amount: Money = Field(description="Fee amount. Contains two sub-fields:<br> 1. Value: Amount, including the cents<br> 2. Currency: Currency code based on ISO ")
     fee_type: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="Type of fee for each transfer to DANA transaction. Such as admin fee")
     additional_info: Optional[Dict[str, Any]] = Field(default=None, description="Additional information")
-    __properties: ClassVar[List[str]] = ["responseCode", "responseMessage", "referenceNo", "partnerReferenceNo", "sessionId", "customerNumber", "customerName", "customerMonthlyLimit", "minAmount", "maxAmount", "amount", "feeAmount", "feeType", "additionalInfo"]
+    __properties: ClassVar[List[str]] = ["responseCode", "responseMessage", "referenceNo", "partnerReferenceNo", "sessionId", "customerNumber", "customerName", "customerMonthlyInLimit", "minAmount", "maxAmount", "amount", "feeAmount", "feeType", "additionalInfo"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -133,7 +133,7 @@ class DanaAccountInquiryResponse(BaseModel, BaseSdkModel):
             "sessionId": obj.get("sessionId"),
             "customerNumber": obj.get("customerNumber"),
             "customerName": obj.get("customerName"),
-            "customerMonthlyLimit": obj.get("customerMonthlyLimit"),
+            "customerMonthlyInLimit": obj.get("customerMonthlyInLimit"),
             "minAmount": Money.from_dict(obj["minAmount"]) if obj.get("minAmount") is not None else None,
             "maxAmount": Money.from_dict(obj["maxAmount"]) if obj.get("maxAmount") is not None else None,
             "amount": Money.from_dict(obj["amount"]) if obj.get("amount") is not None else None,

{dana_python-1.1.0 → dana_python-1.1.1}/dana/disbursement/v1/models/transfer_to_bank_response.py

@@ -50,7 +50,7 @@ class TransferToBankResponse(BaseModel, BaseSdkModel):
     reference_no: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Transaction identifier on DANA system")
     partner_reference_no: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Unique transaction identifier on partner system which assigned to each transaction<br> Notes:<br> If the partner receives a timeout or an unexpected response from DANA and partner expects to perform retry request to DANA, please use the partnerReferenceNo that is the same as the one used in the transaction request process before ")
     transaction_date: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="Transaction date, in format YYYY-MM-DDTHH:mm:ss+07:00. Time must be in GMT+7 (Jakarta time)")
-    reference_number: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Reference number")
+    reference_number: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Reference number")
     additional_info: Optional[Dict[str, Any]] = Field(default=None, description="Additional information")
     __properties: ClassVar[List[str]] = ["responseCode", "responseMessage", "referenceNo", "partnerReferenceNo", "transactionDate", "referenceNumber", "additionalInfo"]
 

{dana_python-1.1.0 → dana_python-1.1.1}/dana/disbursement/v1/models/transfer_to_dana_response.py

@@ -52,9 +52,10 @@ class TransferToDanaResponse(BaseModel, BaseSdkModel):
     partner_reference_no: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Unique transaction identifier on partner system which assigned to each transaction<br> Notes:<br> If the partner receives a timeout or an unexpected response from DANA and partner expects to perform retry request to DANA, please use the partnerReferenceNo that is the same as the one used in the transaction request process before ")
     session_id: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="Session identifier")
     customer_number: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Customer account number, in format 628xxx")
+    customer_name: Optional[Annotated[str, Field(strict=True, max_length=255)]] = Field(default=None, description="Customer account name")
     amount: Money = Field(description="Amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO ")
     additional_info: Optional[Dict[str, Any]] = Field(default=None, description="Additional information")
-    __properties: ClassVar[List[str]] = ["responseCode", "responseMessage", "referenceNo", "partnerReferenceNo", "sessionId", "customerNumber", "amount", "additionalInfo"]
+    __properties: ClassVar[List[str]] = ["responseCode", "responseMessage", "referenceNo", "partnerReferenceNo", "sessionId", "customerNumber", "customerName", "amount", "additionalInfo"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -117,6 +118,7 @@ class TransferToDanaResponse(BaseModel, BaseSdkModel):
             "partnerReferenceNo": obj.get("partnerReferenceNo"),
             "sessionId": obj.get("sessionId"),
             "customerNumber": obj.get("customerNumber"),
+            "customerName": obj.get("customerName"),
             "amount": Money.from_dict(obj["amount"]) if obj.get("amount") is not None else None,
             "additionalInfo": obj.get("additionalInfo")
         })

{dana_python-1.1.0 → dana_python-1.1.1}/dana/merchant_management/v1/enum.py

@@ -250,6 +250,7 @@ class PayMethod(str, Enum):
     ONLINE_CREDIT = "ONLINE_CREDIT"
     LOAN_CREDIT = "LOAN_CREDIT"
     NETWORK_PAY = "NETWORK_PAY"
+    CARD = "CARD"
 
 class PayMethod(str, Enum):
     BALANCE = "BALANCE"

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/api/payment_gateway_api.py

@@ -539,12 +539,12 @@ class PaymentGatewayApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'ORIGIN', 
             'X_PARTNER_ID', 
             'CHANNEL_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers
@@ -798,12 +798,12 @@ class PaymentGatewayApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'ORIGIN', 
             'X_PARTNER_ID', 
             'CHANNEL_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/enum.py

@@ -41,6 +41,7 @@ class PayMethod(str, Enum):
     ONLINE_CREDIT = "ONLINE_CREDIT"
     LOAN_CREDIT = "LOAN_CREDIT"
     NETWORK_PAY = "NETWORK_PAY"
+    CARD = "CARD"
 
 class PayOption(str, Enum):
     NETWORK_PAY_PG_SPAY = "NETWORK_PAY_PG_SPAY"

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/actor_context.py

@@ -46,7 +46,7 @@ class ActorContext(BaseModel, BaseSdkModel):
     ActorContext
     """ # noqa: E501
     actor_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Actor identifier")
-    actor_type: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Actor type. The enums:<br> * USER - User<br> * MERCHANT - Merchant<br * MERCHANT_OPERATOR - Merchant operator<br> * BACK_OFFICE - Back office<br> * SYSTEM - System<br> ")
+    actor_type: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Actor type. The enums:<br> * USER - User<br> * MERCHANT - Merchant<br> * MERCHANT_OPERATOR - Merchant operator<br> * BACK_OFFICE - Back office<br> * SYSTEM - System<br> ")
     __properties: ClassVar[List[str]] = ["actorId", "actorType"]
 
     @field_validator('actor_type')

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/create_order_by_api_request.py

@@ -56,7 +56,7 @@ class CreateOrderByApiRequest(BaseModel, BaseSdkModel):
     sub_merchant_id: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Information of sub merchant identifier")
     amount: Money = Field(description="Amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO<br> ")
     external_store_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Store identifier to indicate to which store this payment belongs to")
-    valid_up_to: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="The time when the payment will be automatically expired, in format YYYY-MM-DDTHH:mm:ss+07:00. Time must be in GMT+7 (Jakarta time)")
+    valid_up_to: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="The time when the payment will be automatically expired, in format YYYY-MM-DDTHH:mm:ss+07:00. Time must be in GMT+7 (Jakarta time) and cannot be more than one week in the future.")
     disabled_pay_methods: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Payment method(s) that cannot be used for this")
     url_params: List[UrlParam] = Field(description="Notify URL that DANA must send the payment notification to")
     __properties: ClassVar[List[str]] = ["partnerReferenceNo", "merchantId", "subMerchantId", "amount", "externalStoreId", "validUpTo", "disabledPayMethods", "urlParams"]

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/create_order_by_redirect_request.py

@@ -54,7 +54,7 @@ class CreateOrderByRedirectRequest(BaseModel, BaseSdkModel):
     sub_merchant_id: Optional[Annotated[str, Field(strict=True, max_length=32)]] = Field(default=None, description="Information of sub merchant identifier")
     amount: Money = Field(description="Amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO<br> ")
     external_store_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Store identifier to indicate to which store this payment belongs to")
-    valid_up_to: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="The time when the payment will be automatically expired, in format YYYY-MM-DDTHH:mm:ss+07:00. Time must be in GMT+7 (Jakarta time)")
+    valid_up_to: Optional[Annotated[str, Field(strict=True, max_length=25)]] = Field(default=None, description="The time when the payment will be automatically expired, in format YYYY-MM-DDTHH:mm:ss+07:00. Time must be in GMT+7 (Jakarta time) and cannot be more than one week in the future.")
     disabled_pay_methods: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Payment method(s) that cannot be used for this")
     url_params: List[UrlParam] = Field(description="Notify URL that DANA must send the payment notification to")
     __properties: ClassVar[List[str]] = ["partnerReferenceNo", "merchantId", "subMerchantId", "amount", "externalStoreId", "validUpTo", "disabledPayMethods", "urlParams"]

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/goods.py

@@ -46,6 +46,7 @@ class Goods(BaseModel, BaseSdkModel):
     """
     Goods
     """ # noqa: E501
+    name: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Goods name")
     merchant_goods_id: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Goods identifier provided by merchant")
     description: Annotated[str, Field(strict=True, max_length=1024)] = Field(description="Goods description")
     category: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Goods category")
@@ -55,7 +56,7 @@ class Goods(BaseModel, BaseSdkModel):
     merchant_shipping_id: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Shipment identifier provided by merchant")
     snapshot_url: Optional[Annotated[str, Field(strict=True, max_length=512)]] = Field(default=None, description="The URL of good's snapshot web page")
     extend_info: Optional[Annotated[str, Field(strict=True, max_length=4096)]] = Field(default=None, description="Extend information")
-    __properties: ClassVar[List[str]] = ["merchantGoodsId", "description", "category", "price", "unit", "quantity", "merchantShippingId", "snapshotUrl", "extendInfo"]
+    __properties: ClassVar[List[str]] = ["name", "merchantGoodsId", "description", "category", "price", "unit", "quantity", "merchantShippingId", "snapshotUrl", "extendInfo"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -112,6 +113,7 @@ class Goods(BaseModel, BaseSdkModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "name": obj.get("name"),
             "merchantGoodsId": obj.get("merchantGoodsId"),
             "description": obj.get("description"),
             "category": obj.get("category"),

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/pay_option_detail.py

@@ -47,7 +47,7 @@ class PayOptionDetail(BaseModel, BaseSdkModel):
     """
     PayOptionDetail
     """ # noqa: E501
-    pay_method: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Payment method that used to payment. The enums:<br>   * BALANCE - Payment method with balance<br>   * COUPON - Payment method with coupon<br>   * NET_BANKING - Payment method with internet banking<br>   * CREDIT_CARD - Payment method with credit card<br>   * DEBIT_CARD - Payment method with debit card<br>   * VIRTUAL_ACCOUNT - Payment method with virtual account<br>   * OTC - Payment method with OTC<br>   * DIRECT_DEBIT_CREDIT_CARD - Payment method with direct debit of credit card<br>   * DIRECT_DEBIT_DEBIT_CARD - Payment method with direct debit of debit card<br>   * ONLINE_CREDIT - Payment method with online Credit<br>   * LOAN_CREDIT - Payment method with DANA Cicil<br>   * NETWORK_PAY - Payment method with e-wallet<br> ")
+    pay_method: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Payment method that used to payment. The enums:<br>   * BALANCE - Payment method with balance<br>   * COUPON - Payment method with coupon<br>   * NET_BANKING - Payment method with internet banking<br>   * CREDIT_CARD - Payment method with credit card<br>   * DEBIT_CARD - Payment method with debit card<br>   * VIRTUAL_ACCOUNT - Payment method with virtual account<br>   * OTC - Payment method with OTC<br>   * DIRECT_DEBIT_CREDIT_CARD - Payment method with direct debit of credit card<br>   * DIRECT_DEBIT_DEBIT_CARD - Payment method with direct debit of debit card<br>   * ONLINE_CREDIT - Payment method with online Credit<br>   * LOAN_CREDIT - Payment method with DANA Cicil<br>   * NETWORK_PAY - Payment method with e-wallet<br>   * CARD - Payment method with card<br> ")
     pay_option: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Payment option that available to used to payment, depends on the payment method. The enums:<br>   * NETWORK_PAY_PG_SPAY - Payment method with ShopeePay e-wallet<br>   * NETWORK_PAY_PG_OVO - Payment method with OVO e-wallet<br>   * NETWORK_PAY_PG_GOPAY - Payment method with GoPay e-wallet<br>   * NETWORK_PAY_PG_LINKAJA - Payment method with LinkAja e-wallet<br>   * NETWORK_PAY_PG_CARD - Payment method with Card<br>   * NETWORK_PAY_PG_QRIS - Payment method with QRIS<br>   * VIRTUAL_ACCOUNT_BCA - Payment method with BCA virtual account<br>   * VIRTUAL_ACCOUNT_BNI - Payment method with BNI virtual account<br>   * VIRTUAL_ACCOUNT_MANDIRI - Payment method with Mandiri virtual account<br>   * VIRTUAL_ACCOUNT_BRI - Payment method with BRI virtual account<br>   * VIRTUAL_ACCOUNT_BTPN - Payment method with BTPN virtual account<br>   * VIRTUAL_ACCOUNT_CIMB - Payment method with CIMB virtual account<br>   * VIRTUAL_ACCOUNT_PERMATA - Payment method with Permata virtual account<br> ")
     trans_amount: Money = Field()
     fee_amount: Optional[Money] = Field(default=None)
@@ -61,8 +61,8 @@ class PayOptionDetail(BaseModel, BaseSdkModel):
         """Validates the enum"""
         if value == "":
             return value
-        if value not in set(['BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY']):
-            raise ValueError("must be one of enum values ('BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY')")
+        if value not in set(['BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY', 'CARD']):
+            raise ValueError("must be one of enum values ('BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY', 'CARD')")
         return value
 
     @field_validator('pay_option')

{dana_python-1.1.0 → dana_python-1.1.1}/dana/payment_gateway/v1/models/pay_option_info.py

@@ -46,7 +46,7 @@ class PayOptionInfo(BaseModel, BaseSdkModel):
     """
     PayOptionInfo
     """ # noqa: E501
-    pay_method: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Payment method name. The enums:<br>   * BALANCE - Payment method with balance<br>   * COUPON - Payment method with coupon<br>   * NET_BANKING - Payment method with internet banking<br>   * CREDIT_CARD - Payment method with credit card<br>   * DEBIT_CARD - Payment method with debit card<br>   * VIRTUAL_ACCOUNT - Payment method with virtual account<br>   * OTC - Payment method with OTC<br>   * DIRECT_DEBIT_CREDIT_CARD - Payment method with direct debit of credit card<br>   * DIRECT_DEBIT_DEBIT_CARD - Payment method with direct debit of debit card<br>   * ONLINE_CREDIT - Payment method with online Credit<br>   * LOAN_CREDIT - Payment method with DANA Cicil<br>   * NETWORK_PAY - Payment method with e-wallet ")
+    pay_method: Annotated[str, Field(strict=True, max_length=64)] = Field(description="Payment method name. The enums:<br>   * BALANCE - Payment method with balance<br>   * COUPON - Payment method with coupon<br>   * NET_BANKING - Payment method with internet banking<br>   * CREDIT_CARD - Payment method with credit card<br>   * DEBIT_CARD - Payment method with debit card<br>   * VIRTUAL_ACCOUNT - Payment method with virtual account<br>   * OTC - Payment method with OTC<br>   * DIRECT_DEBIT_CREDIT_CARD - Payment method with direct debit of credit card<br>   * DIRECT_DEBIT_DEBIT_CARD - Payment method with direct debit of debit card<br>   * ONLINE_CREDIT - Payment method with online Credit<br>   * LOAN_CREDIT - Payment method with DANA Cicil<br>   * NETWORK_PAY - Payment method with e-wallet   * CARD - Payment method with Card ")
     pay_option: Optional[Annotated[str, Field(strict=True, max_length=64)]] = Field(default=None, description="Payment option which shows the provider of this payment. The enums:<br>   * NETWORK_PAY_PG_SPAY - Payment method with ShopeePay e-wallet<br>   * NETWORK_PAY_PG_OVO - Payment method with OVO e-wallet<br>   * NETWORK_PAY_PG_GOPAY - Payment method with GoPay e-wallet<br>   * NETWORK_PAY_PG_LINKAJA - Payment method with LinkAja e-wallet<br>   * NETWORK_PAY_PG_CARD - Payment method with Card<br>   * VIRTUAL_ACCOUNT_BCA - Payment method with BCA virtual account<br>   * VIRTUAL_ACCOUNT_BNI - Payment method with BNI virtual account<br>   * VIRTUAL_ACCOUNT_MANDIRI - Payment method with Mandiri virtual account<br>   * VIRTUAL_ACCOUNT_BRI - Payment method with BRI virtual account<br>   * VIRTUAL_ACCOUNT_BTPN - Payment method with BTPN virtual account<br>   * VIRTUAL_ACCOUNT_CIMB - Payment method with CIMB virtual account<br>   * VIRTUAL_ACCOUNT_PERMATA - Payment method with Permata virtual account<br> ")
     pay_amount: Optional[Money] = Field(default=None, description="Pay amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO<br> ")
     trans_amount: Optional[Money] = Field(default=None, description="Trans amount. Contains two sub-fields:<br> 1. Value: Transaction amount, including the cents<br> 2. Currency: Currency code based on ISO<br> ")
@@ -61,8 +61,8 @@ class PayOptionInfo(BaseModel, BaseSdkModel):
         """Validates the enum"""
         if value == "":
             return value
-        if value not in set(['BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY']):
-            raise ValueError("must be one of enum values ('BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY')")
+        if value not in set(['BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY', 'CARD']):
+            raise ValueError("must be one of enum values ('BALANCE', 'COUPON', 'NET_BANKING', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'OTC', 'DIRECT_DEBIT_CREDIT_CARD', 'DIRECT_DEBIT_DEBIT_CARD', 'ONLINE_CREDIT', 'LOAN_CREDIT', 'NETWORK_PAY', 'CARD')")
         return value
 
     @field_validator('pay_option')

{dana_python-1.1.0 → dana_python-1.1.1}/dana/utils/models.py

@@ -45,4 +45,4 @@ def get_model_from_name(*, name: str) -> Any:
             return getattr(sys.modules[module_name], name, None)
 
         else:
-            raise ValueError("Unregistered model")
+            raise ValueError("Unregistered model")

{dana_python-1.1.0 → dana_python-1.1.1}/dana/utils/open_api_configuration.py

@@ -46,6 +46,7 @@ OpenApiAuthSettings = TypedDict(
     {
         "CLIENT_SECRET": APIKeyAuthSetting,
         "CLIENT_ID": APIKeyAuthSetting,
+        "DANA_ENV": APIKeyAuthSetting,
         "ENV": APIKeyAuthSetting,
         "ACCESS_TOKEN": APIKeyAuthSetting,
         "PRIVATE_KEY": APIKeyAuthSetting,
@@ -96,6 +97,7 @@ class OpenApiConfiguration(BaseConfiguration):
     auth_settings = OpenApiAuthSettings(
         CLIENT_SECRET=os.getenv("CLIENT_SECRET"),
         CLIENT_ID=os.getenv("CLIENT_ID"),
+        DANA_ENV=os.getenv("DANA_ENV"),
         ENV=Env.SANDBOX
     )
     config = OpenApiConfiguration(api_key=auth_settings)
@@ -132,9 +134,9 @@ class OpenApiConfiguration(BaseConfiguration):
         self.ignore_operation_servers = ignore_operation_servers
         
         # Set host based on environment
-        if api_key and "ENV" in api_key:
-            self.host = "https://api.sandbox.dana.id" if api_key["ENV"] == Env.SANDBOX else \
-                       "https://api.saas.dana.id" if api_key["ENV"] == Env.PRODUCTION else None
+        if api_key and ("DANA_ENV" in api_key or "ENV" in api_key):
+            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 = self.host
         else:
             self.host = host or "https://api.sandbox.dana.id"
@@ -329,10 +331,10 @@ class OpenApiConfiguration(BaseConfiguration):
 
     def get_host_settings(self) -> List[HostSetting]:
         """Gets an array of host settings"""
-        if self.api_key and "ENV" in self.api_key:
-            if self.api_key["ENV"] == Env.SANDBOX:
+        if self.api_key and ("DANA_ENV" in self.api_key or "ENV" in self.api_key):
+            if self.api_key["DANA_ENV"] == Env.SANDBOX or self.api_key["ENV"] == Env.SANDBOX:
                 return [{'url': "https://api.sandbox.dana.id", 'description': "Sandbox server"}]
-            elif self.api_key["ENV"] == Env.PRODUCTION:
+            elif self.api_key["DANA_ENV"] == Env.PRODUCTION or self.api_key["ENV"] == Env.PRODUCTION:
                 return [{'url': "https://api.saas.dana.id", 'description': "Production server"}]
         
         return [{'url': "https://api.sandbox.dana.id", 'description': "Default sandbox server"}]

{dana_python-1.1.0 → dana_python-1.1.1}/dana/utils/snap_configuration.py

@@ -130,6 +130,7 @@ AuthSettings = TypedDict(
         "X_PARTNER_ID": APIKeyAuthSetting,
         "CHANNEL_ID": APIKeyAuthSetting,
         "ENV": APIKeyAuthSetting,
+        "DANA_ENV": APIKeyAuthSetting,
     },
     total=False,
 )
@@ -229,10 +230,10 @@ class SnapConfiguration(BaseConfiguration):
     ) -> None:
         """Constructor
         """
-        self.host = "http://api.sandbox.dana.id" if api_key["ENV"] == Env.SANDBOX else \
-        "https://api.saas.dana.id" if api_key["ENV"] == Env.PRODUCTION else None
-        self._base_path = "http://api.sandbox.dana.id" if api_key["ENV"] == Env.SANDBOX else \
-        "https://api.saas.dana.id" if api_key["ENV"] == Env.PRODUCTION else None
+        self.host = "http://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 \
+        "https://api.saas.dana.id" if (api_key["DANA_ENV"] == Env.PRODUCTION or api_key["ENV"] == Env.PRODUCTION) else None
         """Default Base url
         """
         self.server_index = 0 if server_index is None and host is None else server_index
@@ -587,12 +588,12 @@ class SnapConfiguration(BaseConfiguration):
                 'url': "http://api.sandbox.dana.id",
                 'description': "No description provided",
             }
-        ] if self.api_key["ENV"] == Env.SANDBOX else [
+        ] if (self.api_key["DANA_ENV"] == Env.SANDBOX or self.api_key["ENV"] == Env.SANDBOX) else [
             {
                 'url': "https://api.saas.dana.id",
                 'description': "No description provided",
             }
-        ] if self.api_key["ENV"] == Env.PRODUCTION else None
+        ] if (self.api_key["DANA_ENV"] == Env.PRODUCTION or self.api_key["ENV"] == Env.PRODUCTION) else None
 
         return host_settings
 

{dana_python-1.1.0 → dana_python-1.1.1}/dana/utils/snap_header.py

@@ -14,11 +14,13 @@
 
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import padding
-from cryptography.hazmat.primitives.serialization import load_pem_private_key
+from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key
 from cryptography.hazmat.backends import default_backend
+import re
 import base64
 from hashlib import sha256
 import uuid
+import os
 import json
 from typing import Any, List, Mapping
 from datetime import datetime, timedelta, timezone
@@ -56,6 +58,10 @@ class SnapHeader:
         X_PARTNER_ID, X_EXTERNALID, X_IP_ADDRESS, 
         X_DEVICE_ID, X_LATITUDE, X_LONGITUDE, CHANNEL_ID
     ]
+    SnapBalanceInquiryRuntimeHeaders: List[str] = [
+        AUTHORIZATION_CUSTOMER, X_TIMESTAMP, X_SIGNATURE, 
+        X_PARTNER_ID, X_EXTERNALID, X_DEVICE_ID, CHANNEL_ID
+    ]
 
     @staticmethod
     def merge_with_snap_runtime_headers(auth_from_users: List[str], scenario: str="") -> List[str]:
@@ -79,9 +85,132 @@ class SnapHeader:
         elif scenario == "apply_ott" or scenario == "unbinding_account":
             return list(set(filtered_auth).union(SnapHeader.SnapApplyOTTRuntimeHeaders))
         
+        elif scenario == "balance_inquiry":
+            return list(set(filtered_auth).union(SnapHeader.SnapBalanceInquiryRuntimeHeaders))
+        
         else:
             return list(set(filtered_auth).union(SnapHeader.SnapRuntimeHeaders))
 
+    @staticmethod
+    def convert_to_pem(key: str, key_type: str) -> str:
+        """
+        Convert a key to PEM format
+        
+        Args:
+            key: The key as a string
+            key_type: Type of key ("PRIVATE" or "PUBLIC")
+            
+        Returns:
+            The key in PEM format
+        """
+        # Determine if this is an RSA key or generic private key format
+        possible_headers = [
+            f"-----BEGIN {key_type} KEY-----",
+            f"-----BEGIN RSA {key_type} KEY-----"
+        ]
+        possible_footers = [
+            f"-----END {key_type} KEY-----",
+            f"-----END RSA {key_type} KEY-----"
+        ]
+        
+        delimiter = "\n"
+        header_found = None
+        footer_found = None
+        
+        # Clean up the key first
+        key = key.strip()
+        
+        # Replace escaped newlines with actual newlines
+        key = key.replace('\\n', "\n")
+        
+        # Check if key already has headers/footers
+        for index, header in enumerate(possible_headers):
+            if header in key and possible_footers[index] in key:
+                header_found = header
+                footer_found = possible_footers[index]
+                break
+        
+        # If headers/footers found, extract and clean the body
+        if header_found is not None and footer_found is not None:
+            # Extract body between header and footer
+            parts = key.split(header_found, 1)
+            parts = parts[1].split(footer_found, 1)
+            body = parts[0].strip()
+            
+            # Keep the original format but ensure proper line breaks
+            body = re.sub(r'\s+', '', body)  # Remove all whitespace
+            # Format with proper line breaks - chunk into 64-character lines
+            formatted_body = ''
+            for i in range(0, len(body), 64):
+                formatted_body += body[i:i+64] + delimiter
+            
+            return header_found + delimiter + formatted_body + footer_found
+        
+        # For keys without headers/footers - try both RSA and standard formats
+        # Remove all whitespace
+        clean_key = re.sub(r'\s+', '', key)
+        # Format with proper line breaks
+        formatted_body = ''
+        for i in range(0, len(clean_key), 64):
+            formatted_body += clean_key[i:i+64] + delimiter
+        
+        # First attempt standard key format
+        standard_header = f"-----BEGIN {key_type} KEY-----"
+        standard_footer = f"-----END {key_type} KEY-----"
+        formatted_key = standard_header + delimiter + formatted_body + standard_footer
+        
+        # Try to validate the key using cryptography library
+        try:
+            # For private keys
+            if key_type == "PRIVATE":
+                load_pem_private_key(formatted_key.encode(), password=None, backend=default_backend())
+                return formatted_key
+            # For public keys
+            elif key_type == "PUBLIC":
+                load_pem_public_key(formatted_key.encode(), backend=default_backend())
+                return formatted_key
+        except Exception:
+            # If standard format fails, try RSA format
+            pass
+            
+        # Try RSA format
+        rsa_header = f"-----BEGIN RSA {key_type} KEY-----"
+        rsa_footer = f"-----END RSA {key_type} KEY-----"
+        rsa_formatted_key = rsa_header + delimiter + formatted_body + rsa_footer
+        
+        return rsa_formatted_key
+
+    @staticmethod
+    def get_usable_private_key(private_key: str = None, private_key_path: str = None) -> str:
+        """
+        Get usable private key from either file path or string content
+        
+        Args:
+            private_key: Optional private key content as string
+            private_key_path: Optional path to private key file
+            
+        Returns:
+            str: Properly formatted private key as PEM
+            
+        Raises:
+            ValueError: If neither private_key nor private_key_path is provided or valid
+        """
+        # If private_key_path is provided and exists, it takes precedence over private_key
+        if private_key_path and os.path.exists(private_key_path):
+            with open(private_key_path, 'rb') as pem_in:
+                pemlines = pem_in.read()
+                key = pemlines.decode('utf-8')
+                return SnapHeader.convert_to_pem(key, "PRIVATE")
+        
+        # Handle direct private key string
+        if private_key:
+            # Replace escaped newlines with actual newlines
+            key = private_key.replace("\\n", "\n")
+            return SnapHeader.convert_to_pem(key, "PRIVATE")
+            
+        # Throw exception if neither key is provided
+        raise ValueError("Provide one of private_key or private_key_path")
+    
     @staticmethod
     def get_snap_generated_auth(
         method: str,
@@ -100,22 +229,11 @@ class SnapHeader:
                 'type': 'api_key',
                 'value': value
             }
-        
-        def get_usable_private_key(private_key: str, private_key_path: str) -> str:
 
-            if private_key_path:
-                with open(private_key_path, 'rb') as pem_in:
-                    pemlines = pem_in.read()
-                    private_key = load_pem_private_key(pemlines, None, default_backend())
-                    return private_key
-            elif private_key:
-                private_key = private_key.replace("\\n", "\n")
-                return private_key
-            else:
-                raise ValueError("Provide one of private_key or private_key_path")
 
-        private_key = get_usable_private_key(private_key=private_key,
-                                             private_key_path=private_key_path)
+        # Use the class method to get the usable private key
+        private_key = SnapHeader.get_usable_private_key(private_key=private_key,
+                                                      private_key_path=private_key_path)
 
         jakarta_time = datetime.now(timezone.utc) + timedelta(hours=7)
         timestamp = jakarta_time.strftime('%Y-%m-%dT%H:%M:%S+07:00')
@@ -164,6 +282,17 @@ class SnapHeader:
                 X_LONGITUDE: generateApiKeyAuthSetting(key=X_LONGITUDE, value=body_dict.get('additionalInfo', {}).get('longitude', '')),
                 CHANNEL_ID: generateApiKeyAuthSetting(key=CHANNEL_ID, value='95221')
             }
+        elif scenario == "balance_inquiry":
+            external_id = str(uuid.uuid4())
+            body_dict: dict = json.loads(body)
+            return {
+                AUTHORIZATION_CUSTOMER: generateApiKeyAuthSetting(key=AUTHORIZATION_CUSTOMER, value=f"Bearer {body_dict.get('additionalInfo', {}).get('accessToken', '')}"),
+                X_TIMESTAMP: generateApiKeyAuthSetting(key=X_TIMESTAMP, value=timestamp),
+                X_SIGNATURE: generateApiKeyAuthSetting(key=X_SIGNATURE, value=encoded_signature),
+                X_EXTERNALID: generateApiKeyAuthSetting(key=X_EXTERNALID, value=external_id),
+                X_DEVICE_ID: generateApiKeyAuthSetting(key=X_DEVICE_ID, value=body_dict.get('additionalInfo', {}).get('deviceId', '')),
+                CHANNEL_ID: generateApiKeyAuthSetting(key=CHANNEL_ID, value='95221')
+            }
         else:
             external_id = str(uuid.uuid4())
             return {

{dana_python-1.1.0 → dana_python-1.1.1}/dana/widget/v1/api/widget_api.py

@@ -287,10 +287,10 @@ class WidgetApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'X_PARTNER_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers
@@ -546,12 +546,12 @@ class WidgetApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'ORIGIN', 
             'X_PARTNER_ID', 
             'CHANNEL_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers
@@ -807,10 +807,10 @@ class WidgetApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'X_PARTNER_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers
@@ -1074,13 +1074,15 @@ class WidgetApi:
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers
-        _auth_settings = SnapHeader.merge_with_snap_runtime_headers(_auth_settings)
+        _auth_settings = SnapHeader.merge_with_snap_runtime_headers(_auth_settings, scenario="balance_inquiry")
         _generated_auth = SnapHeader.get_snap_generated_auth(
             method='POST', 
             resource_path='/v1.0/balance-inquiry.htm',
             body=balance_inquiry_request.to_json(),
             private_key=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY'),
-            private_key_path=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY_PATH')
+            private_key_path=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY_PATH'),
+            scenario="balance_inquiry",
+            client_key=self.api_client.configuration.get_api_key_with_prefix('X_PARTNER_ID')
         )
         return self.api_client.param_serialize(
             method='POST',
@@ -2326,12 +2328,12 @@ class WidgetApi:
                 _header_params['Content-Type'] = _default_content_type
         # authentication setting
         _auth_settings: List[str] = [
+            'DANA_ENV', 
             'ORIGIN', 
             'X_PARTNER_ID', 
             'CHANNEL_ID', 
             'PRIVATE_KEY', 
-            'PRIVATE_KEY_PATH', 
-            'ENV'
+            'PRIVATE_KEY_PATH'
         ]
         # merge list of auth settings 
         # with list of auth generated at runtime for headers