4.34.0

Co-authored-by: Rajaram Gurumurthi <[email protected]>
Co-authored-by: Kevin Laguerre <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 4.34.0
+* Add prepaid_reloadable from bin data in credit card responses
+* Add support for `PayPalPaymentResource` requests
 
 ## 4.33.1
 * Fixes issue related to missing folders in package paths

Jenkinsfile

@@ -1,4 +1,5 @@
 #!groovy
+
 def FAILED_STAGE
 
 pipeline {
@@ -12,9 +13,8 @@ pipeline {
   stages {
     stage("Audit") {
       parallel {
-
         // Runs a static code analysis scan and posts results to the PayPal Polaris server
-        stage("Polaris") {
+        stage("CodeQL") {
           agent {
             node {
               label ""
@@ -23,7 +23,7 @@ pipeline {
           }
 
           steps {
-            polarisAudit()
+            codeQLv2(python: true)
           }
 
           post {
@@ -34,31 +34,7 @@ pipeline {
             }
           }
         }
-
-
-        // Runs a software composition analysis scan and posts results to the PayPal Black Duck server
-        stage("Black Duck") {
-          agent {
-            node {
-              label ""
-              customWorkspace "workspace/${REPO_NAME}"
-            }
-          }
-
-          steps {
-            blackduckAudit(debug: "true")
-          }
-
-          post {
-            failure {
-              script {
-                FAILED_STAGE = env.STAGE_NAME
-              }
-            }
-          }         
-        }
       }
-    } 
+    }
   }
 }
-

braintree/__init__.py

@@ -50,6 +50,7 @@
 from braintree.payment_method_nonce import PaymentMethodNonce
 from braintree.payment_method_parser import parse_payment_method
 from braintree.paypal_account import PayPalAccount
+from braintree.paypal_payment_resource import PayPalPaymentResource
 from braintree.plan import Plan
 from braintree.plan_gateway import PlanGateway
 from braintree.processor_response_types import ProcessorResponseTypes

braintree/braintree_gateway.py

@@ -17,6 +17,7 @@
 from braintree.payment_method_gateway import PaymentMethodGateway
 from braintree.payment_method_nonce_gateway import PaymentMethodNonceGateway
 from braintree.paypal_account_gateway import PayPalAccountGateway
+from braintree.paypal_payment_resource_gateway import PayPalPaymentResourceGateway
 from braintree.sepa_direct_debit_account_gateway import SepaDirectDebitAccountGateway
 from braintree.plan_gateway import PlanGateway
 from braintree.settlement_batch_summary_gateway import SettlementBatchSummaryGateway
@@ -60,6 +61,7 @@ def __init__(self, config=None, **kwargs):
         self.payment_method = PaymentMethodGateway(self)
         self.payment_method_nonce = PaymentMethodNonceGateway(self)
         self.paypal_account = PayPalAccountGateway(self)
+        self.paypal_payment_resource = PayPalPaymentResourceGateway(self)
         self.plan = PlanGateway(self)
         self.sepa_direct_debit_account = SepaDirectDebitAccountGateway(self)
         self.settlement_batch_summary = SettlementBatchSummaryGateway(self)

braintree/credit_card.py

@@ -127,8 +127,8 @@ class DebitNetwork(Enum):
         Star = "STAR"
         Star_Access = "STAR_ACCESS"
 
-    Commercial = DurbinRegulated = Debit = Healthcare = \
-            CountryOfIssuance = IssuingBank = Payroll = Prepaid = ProductId = CardTypeIndicator
+    Commercial = CountryOfIssuance = Debit = DurbinRegulated = \
+            Healthcare = IssuingBank = Payroll = Prepaid = PrepaidReloadable = ProductId = CardTypeIndicator
 
     @staticmethod
     def create(params=None):

braintree/error_codes.py

@@ -412,6 +412,46 @@ class PayPalAccount(object):
         PaymentMethodNonceUnknown = "92908"
         TokenIsInUse = "92906"
 
+    class PayPalPaymentResource(object):
+        NonceExpired = "97301"
+        IdNotSupported = "97302"
+        NonceRequired = "97303"
+        InvalidEmail = "97304"
+        EmailTooLong = "97305"
+        ExpectedLineItemCollection = "97306"
+        ExpectedLineItemHash = "97307"
+        ExpectedLineItemDebit = "97308"
+        InvalidUnitAmount = "97309"
+        InvalidUnitTaxAmount = "97310"
+        IsoCodeRequired = "97311"
+        IsoCodeUnsupported = "97312"
+        ShippingFieldsMissing = "97313"
+        InvalidAmountBreakdown = "97314"
+        ExpectedShippingOptionCollection = "97315"
+        ShippingOptionsRequired = "97316"
+        ShippingOptionFieldsMissing = "97317"
+        InvalidShippingOptionType = "97318"
+        ShippingOptionIdReused = "97319"
+        TooManyShippingOptionsSelected = "97320"
+        ShippingOptionMustMatchBreakdown = "97321"
+        LineItemsShouldMatchTotal = "97322"
+        LineItemsTaxShouldMatchTotal = "97323"
+        PatchCallFailed = "97324"
+        InvalidAmount = "97325"
+        ShippingIdTooLong = "97326"
+        ShippingLabelTooLong = "97327"
+        ShippingFullNameTooLong = "97328"
+        ShippingAddressTooLong = "97329"
+        ShippingExtendedAddressTooLong = "97330"
+        ShippingLocalityTooLong = "97331"
+        ShippingRegionTooLong = "97332"
+        CountryCodeTooLong = "97333"
+        NationalNumberTooLong = "97334"
+        PostalCodeTooLong = "97335"
+        DescriptionTooLong = "97336"
+        CustomFieldTooLong = "97337"
+        OrderIdTooLong = "97338"
+
     class SettlementBatchSummary(object):
         CustomFieldIsInvalid = "82303"
         SettlementDateIsInvalid = "82302"

braintree/paypal_payment_resource.py

@@ -0,0 +1,98 @@
+import braintree
+from braintree.resource import Resource
+from braintree.configuration import Configuration
+
+class PayPalPaymentResource(Resource):
+    @staticmethod
+    def update(request):
+        return Configuration.gateway().paypal_payment_resource.update(request)
+
+    @staticmethod
+    def update_signature():
+        amount_breakdown = [
+            "discount",
+            "handling",
+            "insurance",
+            "item_total",
+            "shipping",
+            "shipping_discount",
+            "tax_total"
+        ]
+        
+        line_item = [
+            "commodity_code",
+            "description",
+            "discount_amount",
+            "image_url",
+            "kind",
+            "name",
+            "product_code",
+            "quantity",
+            "tax_amount",
+            "total_amount",
+            "unit_amount",
+            "unit_of_measure", 
+            "unit_tax_amount",
+            "upc_code",
+            "upc_type",
+            "url",
+        ]
+
+        shipping_request = [
+            "company",
+            "country_name",
+            "country_code_alpha2",
+            "country_code_alpha3",
+            "country_code_numeric",
+            "extended_address",
+            "first_name",
+            {
+                "international_phone": [
+                    "country_code",
+                    "national_number"
+                ]
+            },
+            "last_name",
+            "locality",
+            "postal_code",
+            "region",
+            "street_address"
+        ]
+
+        shipping_option = [
+            "amount",
+            "id",
+            "label",
+            "selected",
+            "type"
+        ]
+
+        signature = [
+            {
+                "paypal_payment_resource": [
+                    "amount",
+                    { 
+                        "amount_breakdown": amount_breakdown
+                    },
+                    "currency_iso_code",
+                    "custom_field",
+                    "description",
+                    {
+                        "line_items": line_item
+                    },
+                    "order_id",
+                    "payee_email",
+                    "payment_method_nonce",
+                    {
+                        "shipping": shipping_request
+                    },
+                    {
+                        "shipping_options": shipping_option
+                    }
+                ]
+            }
+        ]
+        return signature
+
+    def __init__(self, gateway, attributes):
+        Resource.__init__(self, gateway, attributes)

braintree/paypal_payment_resource_gateway.py

@@ -0,0 +1,29 @@
+from braintree.resource import Resource
+from braintree.paypal_payment_resource import PayPalPaymentResource
+from braintree.payment_method_nonce import PaymentMethodNonce
+from braintree.util.xml_util import XmlUtil
+from braintree.error_result import ErrorResult
+from braintree.successful_result import SuccessfulResult
+from braintree.exceptions.unexpected_error import UnexpectedError
+
+class PayPalPaymentResourceGateway(object):
+    def __init__(self, gateway):
+        self.gateway = gateway
+        self.config = gateway.config
+
+    def update(self, params):
+        Resource.verify_keys(params, PayPalPaymentResource.update_signature())
+
+        response = self.config.http().put(
+            self.config.base_merchant_path()  + "/paypal/payment_resource",
+            params
+        )
+
+        if "payment_method_nonce" in response:
+            return SuccessfulResult({"payment_method_nonce": PaymentMethodNonce(self.gateway, response["payment_method_nonce"])})
+        elif "api_error_response" in response:
+            return ErrorResult(self.gateway, response["api_error_response"])
+        else:
+            raise UnexpectedError("Couldn't parse response")
+
+    

braintree/test/credit_card_numbers.py

@@ -6,6 +6,7 @@ class CardTypeIndicators(object):
         Healthcare = "4111111510101010"
         Payroll  = "4111111114101010"
         Prepaid = "4111111111111210"
+        PrepaidReloadable = "4229989900000002"
         IssuingBank = "4111111141010101"
         CountryOfIssuance = "4111111111121102"
 

braintree/test/nonces.py

@@ -79,6 +79,7 @@ class Nonces(object):
     TransactablePayroll = "fake-valid-payroll-nonce"
     TransactablePinlessDebitVisa = "fake-pinless-debit-visa-nonce"
     TransactablePrepaid = "fake-valid-prepaid-nonce"
+    TransactablePrepaidReloadable = "fake-valid-prepaid-reloadable-nonce"
     TransactableUnknownIndicators = "fake-valid-unknown-indicators-nonce"
     TransactableVisa = "fake-valid-visa-nonce"
     VenmoAccount = "fake-venmo-account-nonce"
@@ -87,4 +88,4 @@ class Nonces(object):
     VisaCheckoutDiscover = "fake-visa-checkout-discover-nonce"
     VisaCheckoutMasterCard = "fake-visa-checkout-mastercard-nonce"
     VisaCheckoutVisa = "fake-visa-checkout-visa-nonce"
-    UsBankAccount = "fake-us-bank-account-nonce"
+    UsBankAccount = "fake-us-bank-account-nonce"