Merge pull request #106 from swlodarski-sumoheavy/9.3.x

SP-1099 - do not throw IPN validation exception when email casing mismatch

Author: p-maguire

Model/Ipn/Validator.php

@@ -15,7 +15,7 @@ class Validator
     public function __construct(\BitPaySDK\Model\Invoice\Invoice $invoice, array $ipnData)
     {
         $name = $ipnData['buyerFields']['buyerName'];
-        $email = $ipnData['buyerFields']['buyerEmail'];
+        $email = strtolower($ipnData['buyerFields']['buyerEmail']);
         $address1 = $ipnData['buyerFields']['buyerAddress1'] ?? null;
         $address2 = $ipnData['buyerFields']['buyerAddress2'] ?? null;
         $amountPaid = $ipnData['amountPaid'];
@@ -25,8 +25,8 @@ public function __construct(\BitPaySDK\Model\Invoice\Invoice $invoice, array $ip
             $this->errors[] = "Name from IPN data ('{$name}') does not match with " .
                 "name from invoice ('{$invoiceBuyerName}')";
         }
-
-        if ($email !== $invoiceBuyerEmail = $invoiceBuyer->getEmail()) {
+        $invoiceBuyerEmail = strtolower($invoiceBuyer->getEmail());
+        if ($email !== $invoiceBuyerEmail) {
             $this->errors[] = "Email from IPN data ('{$email}') does not match with " .
                 "email from invoice ('{$invoiceBuyerEmail}')";
         }

Test/Unit/Model/IpnManagementTest.php

@@ -299,8 +299,45 @@ public function testPostIpnValidatorError(): void
         $client->expects($this->once())->method('getInvoice')->willReturn($invoice);
         $this->client->expects($this->once())->method('initialize')->willReturn($client);
         $this->transactionRepository->expects($this->once())->method('findBy')->willReturn([]);
-        $this->throwException(new IPNValidationException('Email from IPN data (\'[email protected]\') does not' .
-            'match with email from invoice (\'[email protected]\')'));
+
+        $this->response->expects($this->once())->method('addMessage')->with(
+            "Email from IPN data ('{$data['data']['buyerFields']['buyerEmail']}') does not match with " .
+            "email from invoice ('{$invoice->getBuyer()->getEmail()}')",
+            500
+        );
+
+        $this->ipnManagement->postIpn();
+    }
+
+    public function testPostIpnNoValidatorErrorWhenEmailCasingMismatch(): void
+    {
+        $eventName = 'ivoice_confirmed';
+        $orderInvoiceId = '12';
+        $data = [
+            'data' => [
+                'orderId' => '00000012',
+                'id' => $orderInvoiceId,
+                'buyerFields' => [
+                    'buyerName' => 'test',
+                    'buyerEmail' => '[email protected]',
+                    'buyerAddress1' => '12 test road'
+                ],
+                'amountPaid' => 1232132
+            ],
+            'event' => ['name' => $eventName]
+        ];
+        $serializer = new Json();
+        $serializerData = $serializer->serialize($data);
+        $this->serializer->expects($this->once())->method('unserialize')->willReturn($data);
+        $this->request->expects($this->once())->method('getContent')->willReturn($serializerData);
+
+        $invoice = $this->prepareInvoice();
+        $client = $this->getMockBuilder(\BitPaySDK\Client::class)->disableOriginalConstructor()->getMock();
+        $client->expects($this->once())->method('getInvoice')->willReturn($invoice);
+        $this->client->expects($this->once())->method('initialize')->willReturn($client);
+        $this->transactionRepository->expects($this->once())->method('findBy')->willReturn([]);
+
+        $this->response->expects($this->never())->method('addMessage');
 
         $this->ipnManagement->postIpn();
     }