Merge remote-tracking branch 'origin/develop'

Author: fre-sund

README.md

@@ -1641,7 +1641,8 @@ $order = WebPay::checkout($config)
   ->setPushUri("https://svea.com/push.aspx?sid=123&svea_order=123")   // required Merchant settings (push uri)
   ->setTermsUri("http://localhost:51898/terms")                       // required Merchant settings (terms uri)
   ->setValidationCallbackUri('http://localhost:51898/validation-callback') // optional Merchant settings (validation uri)
-  ->setPartnerKey('77FB33EC-505D-4CCF-AA21-D9DF50DC8344')             // optional GUID for partners to Svea, leave blank if you're unsure what this does 
+  ->setPartnerKey('77FB33EC-505D-4CCF-AA21-D9DF50DC8344')             // optional GUID for partners to Svea, leave blank if you're unsure what this does
+  ->setRequireElectronicIdAuthentication(true)                        // optional, force electronic id authentication when customer finalizes order
   ->setLocale('sv-SE')                                                // required for Svea Checkout
   ->createOrder()                                                     // Create new Checkout order
    ;

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "sveaekonomi/webpay",
-  "version": "3.12.1",
+  "version": "3.13.0",
   "description": "Php integration library for Svea Ekonomis payment methods",
   "license": "Apache-2.0",
   "authors": [

example/checkout/createCheckoutOrder.php

@@ -32,6 +32,7 @@
   //->setValidationCallbackUri('http://localhost:51898/validation-callback')
   //->setPartnerKey("77FB33EC-505D-4CCF-AA21-D9DF50DC8344")
   //->setMerchantData("merchantData")
+  //->setRequireElectronicIdAuthentication(true)
     ->setLocale($locale);
 
 $presetPhoneNumber = WebPayItem::presetValue()

src/Checkout/CheckoutOrderEntry.php

@@ -301,4 +301,16 @@ public function setMerchantData($merchantData)
         $this->checkoutOrderBuilder->setMerchantData($merchantData);
         return $this;
     }
+
+    /**
+     * Enable/disable electronic id authentication when end-customer finalizes order, default = false
+     *
+     * @param bool $enabled
+     * @return $this
+     */
+    public function setRequireElectronicIdAuthentication($enabled)
+    {
+        $this->checkoutOrderBuilder->setRequireElectronicIdAuthentication($enabled);
+        return $this;
+    }
 }

src/Checkout/Helper/CheckoutOrderBuilder.php

@@ -55,6 +55,11 @@ class CheckoutOrderBuilder extends OrderBuilder
      */
     protected $merchantData;
 
+    /**
+     * @var bool $requireElectronicIdAuthentication
+     */
+    protected $requireElectronicIdAuthentication;
+
     /**
      * CheckoutOrderBuilder constructor.
      * @param \Svea\WebPay\Config\ConfigurationProvider $config
@@ -348,4 +353,22 @@ public function getMerchantData()
     {
         return $this->merchantData;
     }
+
+    /**
+     * Enable electronic id authentication for end-user if set to true
+     *
+     * @param bool $enabled
+     * @return $this
+     */
+    public function setRequireElectronicIdAuthentication($enabled)
+    {
+        $this->requireElectronicIdAuthentication = $enabled;
+        return $this;
+    }
+
+    public function getRequireElectronicIdAuthentication()
+    {
+        return $this->requireElectronicIdAuthentication;
+    }
+
 }

src/Checkout/Service/CreateOrderService.php

@@ -106,6 +106,11 @@ protected function mapCreateOrderData(CheckoutOrderBuilder $order)
 
         $data['merchantData'] = $order->getMerchantData();
 
+        if($order->getRequireElectronicIdAuthentication() != null)
+        {
+            $data['requireElectronicIdAuthentication'] = $order->getRequireElectronicIdAuthentication();
+        }
+
         return $data;
     }
 }

src/Checkout/Validation/CreateOrderValidator.php

@@ -35,6 +35,25 @@ public function validate($order)
 
         $errors = $this->validateIdentityFlags($order, $errors);
 
+        $errors = $this->validateRequireElectronicIdAuthentication($order, $errors);
+
+        return $errors;
+    }
+
+    /**
+     * @param CheckoutOrderBuilder $order
+     * @param array $errors
+     * @return array
+     */
+    private function validateRequireElectronicIdAuthentication($order, $errors)
+    {
+        if($order->getRequireElectronicIdAuthentication() != null)
+        {
+            if(!is_bool($order->getRequireElectronicIdAuthentication()))
+            {
+                $errors['invalid type'] = "requireElectronicIdAuthentication field isn't a boolean type, use setRequireElectronicIdAuthentication(true)";
+            }
+        }
         return $errors;
     }
 

test/UnitTest/Checkout/Validation/CreateOrderValidationTest.php

@@ -3,6 +3,7 @@
 namespace Svea\WebPay\Test\UnitTest\Checkout\Validation;
 
 use Svea\WebPay\BuildOrder\Validator\OrderValidator;
+use Svea\WebPay\BuildOrder\Validator\ValidationException;
 use Svea\WebPay\Checkout\Helper\CheckoutOrderBuilder;
 use Svea\WebPay\Checkout\Validation\CreateOrderValidator;
 use Svea\WebPay\Test\UnitTest\Checkout\TestCase;
@@ -14,7 +15,7 @@
 class CreateOrderValidationTest extends TestCase
 {
     /**
-     * @var \Svea\WebPay\BuildOrder\Validator\OrderValidator
+     * @var OrderValidator
      */
     protected $validator;
 
@@ -122,4 +123,18 @@ public function ifPartnerKeyPassed()
 
         $this->assertEquals(0, $errorsNum);
     }
+
+    /**
+     * @test
+     */
+    public function requireElectronicIdAuthenticationWrongType()
+    {
+        $this->order->setRequireElectronicIdAuthentication(true);
+
+        $errors = $this->invokeMethod($this->validator, 'validateRequireElectronicIdAuthentication', array($this->order, array()));
+
+        $errorsNum = count($errors);
+
+        $this->assertEquals(0, $errorsNum);
+    }
 }

version.json

@@ -1,3 +1,3 @@
 {
-	"version": "3.12.1"
+	"version": "3.13.0"
 }