Merge pull request #76 from Judopay/3dsResumeCompleteAccountDetails-J…

…R-6384 3dsResumeCompleteAccountDetails-JR-6384
Judopay · Jun 28, 2022 · d8ebd40 · d8ebd40
2 parents ec7a093 + 8cd5692
commit d8ebd40
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 26 deletions.
diff --git a/src/Judopay/Model/CompleteThreeDSecureTwo.php b/src/Judopay/Model/CompleteThreeDSecureTwo.php
@@ -12,7 +12,10 @@ class CompleteThreeDSecureTwo extends Model
     protected $attributes
         = array(
             'receiptId' => DataType::TYPE_STRING,
-            'cv2'       => DataType::TYPE_STRING
+            'cv2'       => DataType::TYPE_STRING,
+
+            // Inner objects
+            'primaryAccountDetails'     => DataType::TYPE_PRIMARY_ACCOUNT_DETAILS,
         );
 
     protected $requiredAttributes

diff --git a/src/Judopay/Model/ResumeThreeDSecureTwo.php b/src/Judopay/Model/ResumeThreeDSecureTwo.php
@@ -14,6 +14,9 @@ class ResumeThreeDSecureTwo extends Model
             'receiptId'         => DataType::TYPE_STRING,
             'cv2'               => DataType::TYPE_STRING,
             'methodCompletion'  => DataType::TYPE_STRING,
+
+            // Inner objects
+            'primaryAccountDetails'     => DataType::TYPE_PRIMARY_ACCOUNT_DETAILS,
         );
 
     protected $requiredAttributes

diff --git a/tests/Builders/ResumeThreeDSecureTwoBuilder.php b/tests/Builders/ResumeThreeDSecureTwoBuilder.php
@@ -22,4 +22,10 @@ public function setThreeDSecureTwoMethodCompletion($methodCompletion)
         $this->setAttribute('methodCompletion', $methodCompletion);
         return $this;
     }
+
+    public function setThreeDSecureTwoPrimaryAccountDetails($primaryAccountDetails)
+    {
+        $this->setAttribute('primaryAccountDetails', $primaryAccountDetails);
+        return $this;
+    }
 }
diff --git a/tests/CheckCardTest.php b/tests/CheckCardTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests;
 
-use Tests\Base\ThreeDSecureTwoTests;
+use PHPUnit\Framework\TestCase;
 use Tests\Builders\CheckCardBuilder;
 use Tests\Helpers\AssertionHelper;
 use Tests\Helpers\ConfigHelper;
 
-class CheckCardTest extends ThreeDSecureTwoTests
+class CheckCardTest extends TestCase
 {
     protected function getBuilder()
     {

diff --git a/tests/PaymentTest.php b/tests/PaymentTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests;
 
+use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_Assert as Assert;
-use Tests\Base\ThreeDSecureTwoTests;
 use Tests\Builders\CardPaymentBuilder;
 use Tests\Builders\GetTransactionBuilder;
 use Tests\Helpers\AssertionHelper;
 use Tests\Helpers\ConfigHelper;
 
-class PaymentTest extends ThreeDSecureTwoTests
+class PaymentTest extends TestCase
 {
     protected function getBuilder()
     {

diff --git a/tests/PreauthTest.php b/tests/PreauthTest.php
diff --git a/tests/RefundTest.php b/tests/RefundTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Base;
+namespace Tests;
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;

diff --git a/tests/RegisterCardTest.php b/tests/RegisterCardTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests;
 
-use Tests\Base\ThreeDSecureTwoTests;
+use PHPUnit\Framework\TestCase;
 use Tests\Builders\RegisterCardBuilder;
 use Tests\Helpers\AssertionHelper;
 use Tests\Helpers\ConfigHelper;
 
-class RegisterCardTest extends ThreeDSecureTwoTests
+class RegisterCardTest extends TestCase
 {
     protected function getBuilder()
     {

diff --git a/tests/Base/ThreeDSecureTwoTests.php → tests/ThreeDSecureTwoTest.php b/tests/Base/ThreeDSecureTwoTests.php → tests/ThreeDSecureTwoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Base;
+namespace Tests;
 
 use GuzzleHttp\Exception\BadResponseException;
 use Judopay\Exception\ApiException;
@@ -13,7 +13,7 @@
 use Tests\Helpers\AssertionHelper;
 use Tests\Helpers\ConfigHelper;
 
-abstract class ThreeDSecureTwoTests extends PaymentTests
+class ThreeDSecureTwoTest extends TestCase
 {
     protected function getPaymentBuilder()
     {
@@ -195,6 +195,59 @@ public function testPaymentWithThreeDSecureTwoResumeTransactionNoCv2()
         }
     }
 
+    public function testPaymentWithThreeDSecureTwoResumeTransactionAccountDetails()
+    {
+        // Build a threeDSecureTwo payment
+        $threeDSecureTwo = array(
+            'authenticationSource'      => "Browser",
+            'methodNotificationUrl'     => "https://www.test.com",
+            'challengeNotificationUrl'  => "https://www.test.com"
+        );
+
+        $cardPayment = $this->getPaymentBuilder()
+            ->setType(CardPaymentBuilder::THREEDSTWO_VISA_CARD)
+            ->setThreeDSecureTwoFields($threeDSecureTwo)
+            ->build(ConfigHelper::getSafeChargeConfig());
+
+        $paymentResult = [];
+
+        try {
+            $paymentResult = $cardPayment->create();
+        } catch (BadResponseException $e) {
+            $this->fail('The request was expected to be successful.'); // We do not expect any exception
+        }
+
+        // We should have received a request for additional device data gathering
+        AssertionHelper::assertRequiresThreeDSecureTwoDeviceDetails($paymentResult);
+
+        $primaryAccountDetailsFields = array(
+            'name'          => 'John Smith',
+            'accountNumber' => '123456',
+            'dateOfBirth'   => '1980-01-01',
+            'postCode'      => 'EC2A 4DP',
+        );
+
+        // Build the Resume3d request for the payment after its device gathering happened
+        $resumeThreeDSecureTwo = $this->getResumeThreeDSecureTwoBuilder($paymentResult['receiptId'])
+            ->setThreeDSecureTwoMethodCompletion("Yes")
+            ->setThreeDSecureTwoPrimaryAccountDetails($primaryAccountDetailsFields)
+            ->build(ConfigHelper::getSafeChargeConfig());
+
+        Assert::assertNotNull($resumeThreeDSecureTwo);
+
+        try {
+            $resumeResult = $resumeThreeDSecureTwo->update();
+            $this->fail('The request was expected to raise an exception.'); // We do not expect any exception
+        } catch (BadResponseException $e) {
+            // We do not expect any model exception because CV2 is not a mandatory request parameter
+            $this->fail('The request was expected to raise an ApiException.');
+        } catch (ApiException $e) {
+            // But we expect an API exception as this API key doesn't have optional CV2
+            $expected = "Sorry, the security code entered is invalid. Please check your details and try again.";
+            assert::assertEquals($expected, $e->getFieldErrors()[0]->getMessage());
+        }
+    }
+
     /*
      * This cannot run as a full automated test because of a step involving a web browser
      */

diff --git a/tests/VoidTest.php b/tests/VoidTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Base;
+namespace Tests;
 
 use PHPUnit\Framework\TestCase;
 use Tests\Builders\CardPaymentBuilder;

diff --git a/tests/WebPaymentTest.php b/tests/WebPaymentTest.php
@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Tests\Builders\CardPaymentBuilder;
-use Tests\Builders\GetTransactionBuilder;
 use Tests\Builders\WebPayments\PaymentBuilder;
 use Tests\Helpers\AssertionHelper;
 use Tests\Helpers\ConfigHelper;