cuenca-validations 2.1.27__tar.gz → 2.1.28__tar.gz

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.27
+Version: 2.1.28
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/cuenca_validations/types/requests.py

@@ -56,6 +56,7 @@ from ..types.enums import (
     WebhookObject,
 )
 from ..typing import DictStrAny
+from ..validators import normalize_email, normalize_phone_number
 from .card import (
     Cvv,
     ExpMonth,
@@ -543,6 +544,16 @@ class UserUpdateRequest(BaseRequest):
             raise ValueError('At least one parameter must be provided')
         return values
 
+    @field_validator('email_address', mode='before')
+    @classmethod
+    def validate_email_address(cls, v: Optional[str]) -> Optional[str]:
+        return normalize_email(v) if v else v
+
+    @field_validator('phone_number', mode='before')
+    @classmethod
+    def validate_phone_number(cls, v: Optional[str]) -> Optional[str]:
+        return normalize_phone_number(v) if v else v
+
     @field_validator('beneficiaries')
     @classmethod
     def beneficiary_percentage(
@@ -641,13 +652,16 @@ class VerificationRequest(BaseRequest):
         },
     )
 
-    @field_validator('recipient')
-    def validate_sender(cls, recipient: str, values):
-        return (
-            EmailStr(recipient)
-            if type == VerificationType.email
-            else PhoneNumber(recipient)
-        )
+    @model_validator(mode='before')
+    @classmethod
+    def normalize_recipient(cls, data):
+        _type = data.get('type')
+        recipient = data.get('recipient')
+        if _type == VerificationType.email:
+            data['recipient'] = normalize_email(recipient)
+        else:
+            data['recipient'] = normalize_phone_number(recipient)
+        return data
 
 
 class VerificationAttemptRequest(BaseRequest):

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/cuenca_validations/validators.py

@@ -1,8 +1,38 @@
 import base64
 import datetime as dt
+import re
 from enum import Enum
 from typing import Any, Callable, Optional, Union
 
+SANITIZE_PHONE_NUMBER = re.compile(r'[+.()\-\s]')
+STRIP_MX_MOBILE_PREFIX = re.compile(r'(52)(?:(?:044)|1)?(\d{10})$')
+STRIP_US_DUPLICATE_PREFIX = re.compile(r'^11(\d{10})$')
+
+
+def normalize_email(email: str) -> str:
+    """Lowercase email and strip plus labels from the local part.
+
+    mateohhr@Yahoo.com          -> mateohhr@yahoo.com
+    guerradzul+cuenca@gmail.com -> guerradzul@gmail.com
+    """
+    local, _, domain = email.partition('@')
+    return f'{local.split("+")[0]}@{domain}'.lower()
+
+
+def normalize_phone_number(phone_number: str) -> str:
+    """Sanitize and normalize phone numbers to E.164 format.
+
+    Handles:
+    - Special characters: +52 (55) 1234-5678 -> +525512345678
+    - MX mobile prefix:   +5215512345678     -> +525512345678
+    - MX 044 prefix:      +520445512345678   -> +525512345678
+    - US duplicate prefix: +116504401222     -> +16504401222
+    """
+    pn = SANITIZE_PHONE_NUMBER.sub('', phone_number)
+    pn = STRIP_MX_MOBILE_PREFIX.sub(r'\1\2', pn)
+    pn = STRIP_US_DUPLICATE_PREFIX.sub(r'1\1', pn)
+    return f'+{pn}'
+
 
 def sanitize_dict(d: dict) -> dict:
     for k, v in d.items():

cuenca_validations-2.1.28/cuenca_validations/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.28'

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/cuenca_validations.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuenca_validations
-Version: 2.1.27
+Version: 2.1.28
 Summary: Cuenca common validations
 Home-page: https://github.com/cuenca-mx/cuenca-validations
 Author: Cuenca

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/cuenca_validations.egg-info/SOURCES.txt

@@ -30,4 +30,5 @@ tests/test_errors.py
 tests/test_helpers.py
 tests/test_requests.py
 tests/test_statement.py
-tests/test_types.py
+tests/test_types.py
+tests/test_validators.py

{cuenca_validations-2.1.27 → cuenca_validations-2.1.28}/tests/test_requests.py

@@ -1,9 +1,12 @@
 import pytest
 from pydantic import ValidationError
+from pydantic_extra_types.phone_numbers import PhoneNumber
 
+from cuenca_validations.types.enums import VerificationType
 from cuenca_validations.types.requests import (
     UserTOSAgreementRequest,
     UserUpdateRequest,
+    VerificationRequest,
 )
 from cuenca_validations.typing import DictStrAny
 
@@ -53,3 +56,29 @@ def test_update_user_update_govt() -> None:
     with pytest.raises(ValueError) as ex:
         UserUpdateRequest(**govt_id)
     assert 'uri_back must be provided for type ine' in str(ex.value)
+
+
+def test_verification_request_normalizes_email() -> None:
+    req = VerificationRequest(
+        recipient='user+cuenca@Gmail.com',
+        type=VerificationType.email,
+    )
+    assert req.recipient == 'user@gmail.com'
+
+
+def test_verification_request_normalizes_phone() -> None:
+    req = VerificationRequest(
+        recipient='+116504401222',
+        type=VerificationType.phone,
+    )
+    assert req.recipient == '+16504401222'
+
+
+def test_user_update_request_normalizes_email() -> None:
+    req = UserUpdateRequest(email_address='user+tag@Gmail.com')
+    assert req.email_address == 'user@gmail.com'
+
+
+def test_user_update_request_normalizes_phone() -> None:
+    req = UserUpdateRequest(phone_number=PhoneNumber('+116504401222'))
+    assert req.phone_number == '+16504401222'

cuenca_validations-2.1.28/tests/test_validators.py

@@ -0,0 +1,35 @@
+import pytest
+
+from cuenca_validations.validators import (
+    normalize_email,
+    normalize_phone_number,
+)
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('user@Yahoo.com', 'user@yahoo.com'),  # uppercase domain
+        ('user@iCloud.com', 'user@icloud.com'),  # uppercase domain
+        ('user@Gmail.com', 'user@gmail.com'),  # uppercase domain
+        ('user+cuenca@gmail.com', 'user@gmail.com'),  # plus label
+        ('user@gmail.com', 'user@gmail.com'),  # already normalized
+    ],
+)
+def test_normalize_email(raw: str, normalized: str) -> None:
+    assert normalize_email(raw) == normalized
+
+
+@pytest.mark.parametrize(
+    'raw, normalized',
+    [
+        ('+116503456789', '+16503456789'),  # US duplicate country code
+        ('+5215512345678', '+525512345678'),  # MX mobile prefix
+        ('+520445512345678', '+525512345678'),  # MX 044 prefix
+        ('+52 (55) 1234-5678', '+525512345678'),  # special characters
+        ('+525512345678', '+525512345678'),  # already correct MX
+        ('+16503456789', '+16503456789'),  # already correct US
+    ],
+)
+def test_normalize_phone_number(raw: str, normalized: str) -> None:
+    assert normalize_phone_number(raw) == normalized

cuenca_validations-2.1.27/cuenca_validations/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.27'