MAGETWO-99736: Authorize.net - 3D Secure 2.0 Support for 2.3

- update composer hash and minor fixes

Author: viktym

app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php

@@ -65,8 +65,8 @@ public function build(array $buildSubject): array
         if ($payment instanceof Payment) {
             $cardinalJwt = (string)$payment->getAdditionalInformation('cardinalJWT');
             $jwtPayload = $this->jwtParser->execute($cardinalJwt);
-            $eciFlag = $jwtPayload['Payload']['Payment']['ExtendedData']['ECIFlag'];
-            $cavv = $jwtPayload['Payload']['Payment']['ExtendedData']['CAVV'];
+            $eciFlag = $jwtPayload['Payload']['Payment']['ExtendedData']['ECIFlag'] ?? '';
+            $cavv = $jwtPayload['Payload']['Payment']['ExtendedData']['CAVV'] ?? '';
             $data = [
                 'transactionRequest' => [
                     'cardholderAuthentication' => [

app/code/Magento/AuthorizenetCardinal/Model/Config.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\AuthorizenetCardinal\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;

app/code/Magento/AuthorizenetCardinal/Test/Unit/Observer/DataAssignObserverTest.php

@@ -86,7 +86,7 @@ public function testDoesntSetDataWhenEmpty()
     /**
      * Tests case when CardinalCommerce is disabled.
      */
-    public function testDoesnttDataWhenEmpty()
+    public function testDoesntSetDataWhenDisabled()
     {
         $config = $this->createMock(Config::class);
         $config->method('isActive')

app/code/Magento/AuthorizenetCardinal/composer.json

@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/module-authorizenet-acceptjs": "*",
+        "magento/framework": "*",
         "magento/module-cardinal-commerce": "*",
         "magento/module-payment": "*",
         "magento/module-sales": "*",

app/code/Magento/CardinalCommerce/Model/Config.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CardinalCommerce\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -92,12 +94,12 @@ public function getOrgUnitId(?int $storeId = null): string
      */
     public function getEnvironment(?int $storeId = null): string
     {
-        $orgUnitId = $this->scopeConfig->getValue(
+        $environment = $this->scopeConfig->getValue(
             'three_d_secure/cardinal/environment',
             ScopeInterface::SCOPE_STORE,
             $storeId
         );
-        return $orgUnitId;
+        return $environment;
     }
 
     /**

app/code/Magento/CardinalCommerce/Model/JwtManagement.php

@@ -53,7 +53,7 @@ public function decode(string $jwt, string $key): array
             throw new \InvalidArgumentException('Wrong number of segments in JWT');
         }
 
-        list($headB64, $payloadB64, $signatureB64) = $parts;
+        [$headB64, $payloadB64, $signatureB64] = $parts;
 
         $headerJson = $this->urlSafeB64Decode($headB64);
         $header = $this->json->unserialize($headerJson);

app/code/Magento/CardinalCommerce/Test/Unit/JwtManagementTest.php renamed to app/code/Magento/CardinalCommerce/Test/Unit/Model/JwtManagementTest.php

@@ -36,7 +36,7 @@
                         <config_path>three_d_secure/cardinal/api_identifier</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     </field>
-                    <field id="debug" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <field id="debug" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Debug</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>three_d_secure/cardinal/debug</config_path>