python-redsys 1.1.1__py3-none-any.whl → 1.2.1__py3-none-any.whl

{python_redsys-1.1.1.dist-info → python_redsys-1.2.1.dist-info}/METADATA

@@ -1,21 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-redsys
-Version: 1.1.1
+Version: 1.2.1
 Summary: A simple, clean and less dependant client to handle payments through Redsys.
-Home-page: https://github.com/systemallica/python-redsys
 License: MIT
-Author: Andrés Reverón Molina
-Author-email: andres@reveronmolina.me
-Requires-Python: >=3.7,<4.0
+License-File: LICENSE
+Author: David Díaz
+Author-email: d.diazp@gmail.com
+Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
-Requires-Dist: pycryptodome (>=3.12.0,<4.0.0)
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Requires-Dist: pycryptodome (>=3.19.0,<4.0.0)
+Project-URL: Homepage, https://github.com/ddiazpinto/python-redsys
 Description-Content-Type: text/markdown
 
 

python_redsys-1.2.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+redsys/__init__.py,sha256=kRuS8epm885TJGvdrjNc9xwT70glq_h9x71_bUgT68s,138
+redsys/client.py,sha256=ervLX4FbzDfWjh_SO2SFyY9IT0PZ5aIcVZdYy4mUO7Q,3937
+redsys/constants.py,sha256=lJYgbmikxh0b9iVM4M5XFWBWVvdFY27OkcXSLluHSsQ,2497
+redsys/request.py,sha256=IEzlRi34JgDBRRyaBHtIrAZ38fADL977RdBFaeWDdbY,5304
+redsys/response.py,sha256=leDhlDlnVLGeruxlN2_3DQ-V56xAbIiFkvoqYDmz9S0,5430
+redsys/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+redsys/tests/test_client.py,sha256=oND8W9y6O6MkDLNxnBpd8UDShwKWoAW3SgKmWDOXHrw,3858
+redsys/tests/test_request.py,sha256=FONigjMNdaug2DwillYKCLPK-gzIYZSVUZmcm9QkCms,3110
+redsys/tests/test_response.py,sha256=V8WdZ1oR4Ed5ZKmi2R-Hpgnr3AyYZy-jFH1yn2S0lA4,1220
+python_redsys-1.2.1.dist-info/METADATA,sha256=Wn6Z7SG3HtRu0PIaxBwEzsDomMFzxO_BH9M4NpFu-uA,4631
+python_redsys-1.2.1.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
+python_redsys-1.2.1.dist-info/licenses/LICENSE,sha256=Ku6mJcUOcHd2aZ4o2Jh4Tjkx1oZT-iT0VCyUNvm2IXU,1257
+python_redsys-1.2.1.dist-info/RECORD,,

{python_redsys-1.1.1.dist-info → python_redsys-1.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry 1.0.7
+Generator: poetry-core 2.5.0
 Root-Is-Purelib: true
 Tag: py3-none-any

redsys/__init__.py

@@ -1,5 +1,2 @@
-__version__ = "1.1.1"
-__version_info__ = tuple(
-    int(num) if num.isdigit() else num
-    for num in __version__.replace("-", ".", 1).split(".")
-)
+__version__ = "1.2.1"
+__version_info__ = tuple(int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split("."))

redsys/client.py

@@ -3,8 +3,10 @@ import hashlib
 import hmac
 import json
 import re
-from abc import ABC, abstractmethod
-from typing import Any, Dict
+from abc import ABC
+from abc import abstractmethod
+from typing import Any
+from typing import Dict
 
 from Crypto.Cipher import DES3
 
@@ -51,16 +53,12 @@ class Client(ABC):
         Generates the encrypted signature using the 3DES-encrypted order
         and base64-encoded merchant parameters
         """
-        signature = hmac.new(
-            encrypted_order, merchant_parameters, hashlib.sha256
-        ).digest()
+        signature = hmac.new(encrypted_order, merchant_parameters, hashlib.sha256).digest()
         return base64.b64encode(signature)
 
     def encrypt_3DES(self, order: str) -> bytes:
         """Encrypts(3DES algorithm) the payment order using the secret key"""
-        cipher = DES3.new(
-            base64.b64decode(self.secret_key), DES3.MODE_CBC, IV=b"\0\0\0\0\0\0\0\0"
-        )
+        cipher = DES3.new(base64.b64decode(self.secret_key), DES3.MODE_CBC, IV=b"\0\0\0\0\0\0\0\0")
         # the cipher needs to be passed 16 bytes,
         # so "order" must be 16 bytes long,
         # therefore we left-justify adding ceros
@@ -96,16 +94,12 @@ class RedirectClient(Client):
         """
         decoded_parameters = self.decode_parameters(merchant_parameters.encode())
         response = Response(decoded_parameters)
-        calculated_signature = self.generate_signature(
-            response.order, merchant_parameters.encode()
-        )
+        calculated_signature = self.generate_signature(response.order, merchant_parameters.encode())
         # Remove any non-alphanumeric characters from the signature
         not_alphanumeric = re.compile("[^a-zA-Z0-9]")
         safe_signature = re.sub(not_alphanumeric, "", signature)
 
-        safe_calculated_signature = re.sub(
-            not_alphanumeric, "", calculated_signature.decode()
-        )
+        safe_calculated_signature = re.sub(not_alphanumeric, "", calculated_signature.decode())
         if safe_signature != safe_calculated_signature:
             raise ValueError("The provided signature is not valid.")
         return response

redsys/request.py

@@ -1,8 +1,11 @@
 import re
 from decimal import Decimal
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
 
-from redsys.constants import CURRENCIES, LANGUAGES, TRANSACTIONS
+from redsys.constants import CURRENCIES
+from redsys.constants import LANGUAGES
+from redsys.constants import TRANSACTIONS
 
 # General parameters
 MERCHANT_CODE = "Ds_Merchant_MerchantCode"
@@ -36,6 +39,10 @@ PAN = "Ds_Merchant_Pan"
 EXPIRY_DATE = "Ds_Merchant_ExpiryDate"
 CVV2 = "Ds_Merchant_Cvv2"
 
+# BIZUM PAYMENT parameters
+MOBILE_NUMBER = "Ds_Merchant_Bizum_MobileNumber"
+PAYMENT_METHOD = "Ds_Merchant_PayMethods"
+
 MERCHANT_PARAMETERS_MAP = {
     "merchant_code": MERCHANT_CODE,
     "terminal": TERMINAL,
@@ -59,6 +66,8 @@ MERCHANT_PARAMETERS_MAP = {
     "pan": PAN,
     "expiry_date": EXPIRY_DATE,
     "cvv2": CVV2,
+    "mobile_number": MOBILE_NUMBER,
+    "payment_method": PAYMENT_METHOD,
 }
 
 
@@ -68,9 +77,11 @@ class Request:
     their values according to the platform specifications
     """
 
-    _parameters: Dict[str, Any] = {}
+    _parameters: Dict[str, Any]
 
     def __init__(self, parameters: Dict[str, Any]) -> None:
+        # __setattr__ only handles merchant parameters, so the per-instance store is set directly.
+        object.__setattr__(self, "_parameters", {})
         for key, value in parameters.items():
             if key in MERCHANT_PARAMETERS_MAP:
                 if check := getattr(self, f"check_{str(key)}", None):
@@ -81,7 +92,7 @@ class Request:
 
     def __getattr__(self, item: str) -> Any:
         if item in MERCHANT_PARAMETERS_MAP:
-            return self._parameters[item]
+            return self._parameters.get(item)
 
     def __setattr__(self, key, value):
         if key in MERCHANT_PARAMETERS_MAP:
@@ -93,9 +104,7 @@ class Request:
         parameters = {}
         for key, value in self._parameters.items():
             prepare = getattr(self, "prepare_%s" % key, None)
-            parameters[MERCHANT_PARAMETERS_MAP[key]] = (
-                prepare(value) if prepare else value
-            )
+            parameters[MERCHANT_PARAMETERS_MAP[key]] = prepare(value) if prepare else value
         return parameters
 
     @staticmethod
@@ -108,7 +117,7 @@ class Request:
 
     @staticmethod
     def check_order(value):
-        if not re.match(r"[0-9]{4}[a-zA-Z0-9]{5}$", value):
+        if not re.match(r"[0-9]{4}[a-zA-Z0-9]{8}$", value):
             raise ValueError("order format is not valid.")
 
     @staticmethod

redsys/response.py

@@ -1,5 +1,6 @@
 from decimal import Decimal
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
 
 RESPONSE = "Ds_Response"
 DATE = "Ds_Date"
@@ -92,12 +93,12 @@ class Response:
     Defines a response
     """
 
-    _parameters: Dict[str, Any] = {}
+    _parameters: Dict[str, Any]
 
     def __init__(self, parameters: Dict[str, Any]):
-        MERCHANT_PARAMETERS_MAP_REVERSE = {
-            value: key for key, value in MERCHANT_PARAMETERS_MAP.items()
-        }
+        # __setattr__ only handles merchant parameters, so the per-instance store is set directly.
+        object.__setattr__(self, "_parameters", {})
+        MERCHANT_PARAMETERS_MAP_REVERSE = {value: key for key, value in MERCHANT_PARAMETERS_MAP.items()}
         for key, value in parameters.items():
             reversed_parameter = MERCHANT_PARAMETERS_MAP_REVERSE.get(key, key)
             clean = getattr(self, "clean_%s" % reversed_parameter, None)
@@ -105,14 +106,12 @@ class Response:
 
     def __getattr__(self, item: str) -> Any:
         if item in MERCHANT_PARAMETERS_MAP:
-            return self._parameters[item]
+            return self._parameters.get(item)
 
     def __setattr__(self, key: str, value: Any):
         if key in MERCHANT_PARAMETERS_MAP:
             clean = getattr(self, "clean_%s" % MERCHANT_PARAMETERS_MAP[key], None)
-            self._parameters[MERCHANT_PARAMETERS_MAP[key]] = (
-                clean(value) if clean else value
-            )
+            self._parameters[MERCHANT_PARAMETERS_MAP[key]] = clean(value) if clean else value
 
     @property
     def is_authorized(self):
@@ -144,4 +143,4 @@ class Response:
 
     @staticmethod
     def clean_amount(value):
-        return Decimal("{}.{}".format(str(value)[:-2], str(value)[-2:]))
+        return Decimal(f"{str(value)[:-2]}.{str(value)[-2:]}")

redsys/tests/test_client.py

@@ -4,7 +4,8 @@ from decimal import Decimal as D
 import pytest
 
 from redsys.client import RedirectClient
-from redsys.constants import EUR, STANDARD_PAYMENT
+from redsys.constants import EUR
+from redsys.constants import STANDARD_PAYMENT
 from redsys.request import Request
 
 
@@ -18,7 +19,7 @@ class TestRedirectClient:
             "terminal": "1",
             "transaction_type": STANDARD_PAYMENT,
             "currency": EUR,
-            "order": "000000001",
+            "order": "000000000001",
             "amount": D("10.56489").quantize(D(".01"), ROUND_HALF_UP),
             "merchant_data": "test merchant data",
             "merchant_name": "Example Commerce",
@@ -33,7 +34,7 @@ class TestRedirectClient:
         encoded_params = self.client.encode_parameters(self.merchant_params)
         encoded_params_str = encoded_params.decode("UTF-8")
         assert encoded_params_str.endswith("ZWRzeXMvcmVzcG9uc2UifQ==")
-        assert len(encoded_params_str) == 624
+        assert len(encoded_params_str) == 628
 
     def test_decode_parameters(self):
         encoded_params = self.client.encode_parameters(self.merchant_params)
@@ -43,24 +44,18 @@ class TestRedirectClient:
     def test_encrypt_3DES(self):
         encrypted_order = self.client.encrypt_3DES(self.request.order)
         assert len(encrypted_order) == 16
-        assert (
-            str(encrypted_order)
-            == 'b"/\\x17\\\\6\\n\\x1aY\\xf3\\xb7\\\\\\xde\'d\\xa5\\x03\\xb7"'
-        )
+        assert str(encrypted_order) == "b'/\\x17\\\\6\\n\\x1aY\\xf3\\xd7\\xa5\\x97\\xb9\\xb6\\xe0\\x8dH'"
 
     def test_sign_hmac256(self):
         encrypted_order = self.client.encrypt_3DES(self.request.order)
         encoded_params = self.client.encode_parameters(self.merchant_params)
         signature = self.client.sign_hmac256(encrypted_order, encoded_params)
-        assert signature == b"eEW4YN7/kkNHRO0/HhXy9TppzHwF38+eZApKAagDI9A="
+        assert signature == b"a2F05DwuH5aXu5vD1IdjQ+NxaR0lPsRwksW1nr2Nzuw="
 
     def test_prepare_request(self):
         prepared_request = self.client.prepare_request(self.parameters)
         assert len(prepared_request.keys()) == 3
-        assert (
-            prepared_request.get("Ds_Signature")
-            == b"eEW4YN7/kkNHRO0/HhXy9TppzHwF38+eZApKAagDI9A="
-        )
+        assert prepared_request.get("Ds_Signature") == b"a2F05DwuH5aXu5vD1IdjQ+NxaR0lPsRwksW1nr2Nzuw="
         pass
 
     def test_create_response_valid(self):
@@ -69,15 +64,13 @@ class TestRedirectClient:
             "Ds_Terminal": "1",
             "Ds_TransactionType": "0",
             "Ds_Currency": 978,
-            "Ds_Order": "000000001",
+            "Ds_Order": "000000000001",
             "Ds_Amount": 1056,
             "Ds_MerchantData": "test merchant data",
         }
         encoded_params = self.client.encode_parameters(merchant_parameters)
         signature = self.client.generate_signature(self.request.order, encoded_params)
-        response = self.client.create_response(
-            signature.decode(), encoded_params.decode()
-        )
+        response = self.client.create_response(signature.decode(), encoded_params.decode())
         assert response._parameters.get("order") == merchant_parameters.get("Ds_Order")
 
     def test_create_response_invalid(self):
@@ -86,7 +79,7 @@ class TestRedirectClient:
             "Ds_Terminal": "1",
             "Ds_TransactionType": "0",
             "Ds_Currency": 978,
-            "Ds_Order": "000000001",
+            "Ds_Order": "000000000001",
             "Ds_Amount": 1056,
             "Ds_MerchantData": "test merchant data",
         }

redsys/tests/test_request.py

@@ -4,7 +4,8 @@ from random import choice
 
 import pytest
 
-from redsys.constants import EUR, STANDARD_PAYMENT
+from redsys.constants import EUR
+from redsys.constants import STANDARD_PAYMENT
 from redsys.request import Request
 
 
@@ -15,7 +16,7 @@ class TestRequest:
             "terminal": "1",
             "transaction_type": STANDARD_PAYMENT,
             "currency": EUR,
-            "order": "000000001",
+            "order": "000000000001",
             "amount": D("10.56489").quantize(D(".01"), ROUND_HALF_UP),
             "merchant_data": "test merchant data",
             "merchant_name": "Example Commerce",
@@ -41,7 +42,7 @@ class TestRequest:
             "terminal": "1",
             "transaction_type": STANDARD_PAYMENT,
             "currency": EUR,
-            "order": "000000001",
+            "order": "000000000001",
             "amount": D("10.56489").quantize(D(".01"), ROUND_HALF_UP),
             "merchant_data": "test merchant data",
             "merchant_name": "Example Commerce",
@@ -51,20 +52,23 @@ class TestRequest:
         }
         prepared_parameters = Request(parameters).prepare_parameters()
         assert len(prepared_parameters.keys()) == 11
-        assert (
-            prepared_parameters.get("Ds_Merchant_MerchantData") == "test merchant data"
-        )
+        assert prepared_parameters.get("Ds_Merchant_MerchantData") == "test merchant data"
 
     def test_super_long_merchant_data_throws_error(self):
-        merchant_data = "".join(
-            choice("abcdefghijklmnopqrtsuvwxyz-0123456789") for _ in range(1025)
-        )
+        merchant_data = "".join(choice("abcdefghijklmnopqrtsuvwxyz-0123456789") for _ in range(1025))
         with pytest.raises(ValueError):
             assert Request.check_merchant_data(merchant_data)
 
     def test_super_long_merchant_url_throws_error(self):
-        merchant_url = "".join(
-            choice("abcdefghijklmnopqrtsuvwxyz-0123456789") for _ in range(251)
-        )
+        merchant_url = "".join(choice("abcdefghijklmnopqrtsuvwxyz-0123456789") for _ in range(251))
         with pytest.raises(ValueError):
             assert Request.check_merchant_url(merchant_url)
+
+    def test_requests_do_not_share_parameters(self):
+        first = Request(
+            {"order": "000000000001", "amount": D("1.00"), "currency": EUR, "mobile_number": "+34700000000"}
+        )
+        second = Request({"order": "000000000002", "amount": D("2.00"), "currency": EUR})
+        assert "Ds_Merchant_Bizum_MobileNumber" not in second.prepare_parameters()
+        assert second.mobile_number is None
+        assert first.prepare_parameters()["Ds_Merchant_Bizum_MobileNumber"] == "+34700000000"

redsys/tests/test_response.py

@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 from redsys.response import Response
 
 
@@ -8,18 +10,23 @@ class TestResponse:
             "Ds_MerchantCode": "1056",
             "Ds_Terminal": "1",
             "Ds_TransactionType": "1",
-            "Ds_Order": "000000001",
+            "Ds_Order": "000000000001",
             "Ds_Amount": "10054",
             "Ds_MerchantData": "test merchant data",
             "Ds_Currency": 978,
         }
         response = Response(parameters)
         assert response.code == 90
-        assert (
-            response.message == "Transacción autorizada para pagos y preautorizaciones"
-        )
+        assert response.message == "Transacción autorizada para pagos y preautorizaciones"
         assert len(response._parameters.keys()) == 8
         assert response.is_authorized is True
         assert response.is_paid is True
         assert response.is_canceled is False
         assert response.is_refunded is False
+
+    def test_responses_do_not_share_parameters(self):
+        first = Response({"Ds_Response": "0000", "Ds_Order": "000000000001", "Ds_Amount": "100"})
+        second = Response({"Ds_Response": "0190", "Ds_Order": "000000000002"})
+        assert "amount" not in second.parameters
+        assert second.amount is None
+        assert first.amount == Decimal("1.00")

python_redsys-1.1.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-redsys/__init__.py,sha256=isoYrgHz945c1Cgxa2CY6lzHZXM3NV2r_KSvgTWKD6k,148
-redsys/client.py,sha256=-wFN9XpKqa-Y3R4InWj-mq_Jtt4-IhO0nbaf4TiQsZM,3992
-redsys/constants.py,sha256=lJYgbmikxh0b9iVM4M5XFWBWVvdFY27OkcXSLluHSsQ,2497
-redsys/request.py,sha256=NuOH-ReP2xw23rtBS5vE1L9lk0BCr7qR4A6SPGJcEqc,4919
-redsys/response.py,sha256=Yz7BvnsHY9UBencH1dO27di5MkVtrZ9SbTBE4QNNP78,5326
-redsys/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-redsys/tests/test_client.py,sha256=7Ra-xYx0dZcSbe8ReszzEM1jD7CW6XDMTqOULtnAnvg,3911
-redsys/tests/test_request.py,sha256=p0zstJwi4_-PL70tQXgNFskp7P5VBCxlDf9ZAaWAOe8,2635
-redsys/tests/test_response.py,sha256=pi-iyAZ2Vc7MF4IUMM8Idztk7d5qD0C7GTkVbX4jrIo,847
-python_redsys-1.1.1.dist-info/LICENSE,sha256=Ku6mJcUOcHd2aZ4o2Jh4Tjkx1oZT-iT0VCyUNvm2IXU,1257
-python_redsys-1.1.1.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
-python_redsys-1.1.1.dist-info/METADATA,sha256=ym0S75ZhTxDrbFdrKDjg74AziZ5Sd_dJevIeaWThvXs,4412
-python_redsys-1.1.1.dist-info/RECORD,,