Merge main into develop-10

.github/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'view/base/web/js'

.github/workflows/codeql.yml

@@ -2,8 +2,7 @@ name: "CodeQL"
 
 on:
   pull_request:
-    paths-ignore:
-      - 'view/base/web/js/**'
+  workflow_dispatch:
 
 jobs:
   analyze:
@@ -24,15 +23,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+          config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

Model/Config/Adminhtml/ApplePayDomainAssociationFileButton.php

@@ -40,9 +40,9 @@ public function __construct(
     }
 
     /**
-     * @return $this|ApplePayDomainAssociationFileButton
+     * @return ApplePayDomainAssociationFileButton
      */
-    protected function _prepareLayout(): ApplePayDomainAssociationFileButton|static
+    protected function _prepareLayout(): ApplePayDomainAssociationFileButton
     {
         parent::_prepareLayout();
 

Model/Ui/AdyenCcConfigProvider.php

@@ -16,6 +16,7 @@
 use Adyen\Payment\Helper\PaymentMethods;
 use Adyen\Payment\Helper\Vault;
 use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\UrlInterface;
@@ -38,6 +39,7 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
     private Config $configHelper;
     private PaymentMethods $paymentMethodsHelper;
     private Vault $vaultHelper;
+    private Http $httpRequest;
 
     public function __construct(
         Data $adyenHelper,
@@ -49,7 +51,8 @@ public function __construct(
         SerializerInterface $serializer,
         Config $configHelper,
         PaymentMethods $paymentMethodsHelper,
-        Vault $vaultHelper
+        Vault $vaultHelper,
+        Http $httpRequest
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->request = $request;
@@ -61,6 +64,7 @@ public function __construct(
         $this->configHelper = $configHelper;
         $this->paymentMethodsHelper = $paymentMethodsHelper;
         $this->vaultHelper = $vaultHelper;
+        $this->httpRequest = $httpRequest;
     }
 
     public function getConfig(): array
@@ -111,6 +115,7 @@ public function getConfig(): array
         $config['payment']['adyenCc']['isCardRecurringEnabled'] = $cardRecurringEnabled;
         $config['payment']['adyenCc']['icons'] = $this->getIcons();
         $config['payment']['adyenCc']['isClickToPayEnabled'] = $this->configHelper->isClickToPayEnabled($storeId);
+        $config['payment']['adyenCc']['controllerName'] = $this->httpRequest->getControllerName();
 
         // has installments by default false
         $config['payment']['adyenCc']['hasInstallments'] = false;

Test/Unit/Model/Ui/AdyenCcConfigProviderTest.php

@@ -17,6 +17,7 @@
 use Adyen\Payment\Helper\Vault;
 use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\File;
@@ -47,6 +48,7 @@ protected function setUp(): void
     {
         $this->adyenHelperMock = $this->createMock(Data::class);
         $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->requestHttpMock = $this->createMock(Http::class);
         $this->urlBuilderMock = $this->createMock(UrlInterface::class);
         $this->assetSourceMock = $this->createMock(Source::class);
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
@@ -66,7 +68,8 @@ protected function setUp(): void
             $this->serializerMock,
             $this->configHelperMock,
             $this->paymentMethodsHelperMock,
-            $this->vaultHelperMock
+            $this->vaultHelperMock,
+            $this->requestHttpMock,
         );
     }
 
@@ -90,6 +93,7 @@ public function testGetConfig($enableInstallments)
         $store = $this->createMock(StoreInterface::class);
         $store->method('getId')->willReturn($storeId);
         $this->storeManagerMock->method('getStore')->willReturn($store);
+        $controllerName = 'index';
 
         $this->configHelperMock->method('getAdyenCcConfigData')
             ->willReturnMap([
@@ -121,10 +125,19 @@ public function testGetConfig($enableInstallments)
         $this->ccConfigMock->expects($this->once())
             ->method('getCvvImageUrl');
 
+        $this->requestHttpMock->expects(
+            $this->once()
+        )->method(
+            'getControllerName'
+        )->willReturn(
+            $controllerName
+        );
+
         $configObject = $this->adyenCcConfigProvider->getConfig();
 
         $this->assertArrayHasKey('installments', $configObject['payment']['adyenCc']);
         $this->assertArrayHasKey('isClickToPayEnabled', $configObject['payment']['adyenCc']);
+        $this->assertArrayHasKey('controllerName', $configObject['payment']['adyenCc']);
         $this->assertArrayHasKey('icons', $configObject['payment']['adyenCc']);
         $this->assertArrayHasKey('isCardRecurringEnabled', $configObject['payment']['adyenCc']);
         $this->assertArrayHasKey('locale', $configObject['payment']['adyenCc']);

VERSION

@@ -1 +1 @@
-9.14.0
+9.14.1

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "9.14.0",
+  "version": "9.14.1",
   "license": "MIT",
   "repositories": [
     {
@@ -18,7 +18,7 @@
     "magento/module-vault": ">=101.2.4",
     "magento/module-multishipping": ">=100.4.4",
     "magento/module-graph-ql": ">=100.4.4",
-    "magento/module-instant-purchase": ">=100.4.4",
+    "magento/module-instant-purchase": ">=100.4.3",
     "ext-json": "*"
   },
   "require-dev": {

view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js

@@ -107,7 +107,7 @@ define(
 
                 // Check the paymentMethods response to enable Credit Card payments
                 if (!!paymentMethodsResponse &&
-                    !paymentMethodsResponse.paymentMethodsResponse.paymentMethods.find(self.isSchemePaymentsEnabled)) {
+                    !paymentMethodsResponse.paymentMethodsResponse?.paymentMethods.find(self.isSchemePaymentsEnabled)) {
                     return;
                 }
 
@@ -533,10 +533,7 @@ define(
                 return true;
             },
             getControllerName: function() {
-                return window.checkoutConfig.payment.iframe.controllerName[this.getCode()];
-            },
-            getPlaceOrderUrl: function() {
-                return window.checkoutConfig.payment.iframe.placeOrderUrl[this.getCode()];
+                return window.checkoutConfig.payment.adyenCc.controllerName;
             },
             grandTotal: function () {
                 for (const totalsegment of quote.getTotals()()['total_segments']) {

view/frontend/web/js/view/payment/method-renderer/adyen-giftcard-method.js

@@ -95,7 +95,7 @@ define(
                 fullScreenLoader.startLoader();
                 let giftcards = [];
 
-                let paymentMethods = paymentMethodsResponse.paymentMethodsResponse.paymentMethods;
+                let paymentMethods = paymentMethodsResponse.paymentMethodsResponse?.paymentMethods;
 
                 if (!!paymentMethods && paymentMethods.length > 0) {
                     giftcards.push({

view/frontend/web/template/payment/cc-form.html

@@ -43,20 +43,16 @@
             <!--/ko-->
         </div>
 
-
         <form class="form" id="adyen-cc-form" data-role="adyen-cc-form" action="#" method="post" data-bind="mageInit: {
             'transparent':{
                 'context': context(),
-                'controller': getControllerName(),
-                'orderSaveUrl':getPlaceOrderUrl(),
+                'controller': getControllerName()
             }, 'validation':[]}">
 
-
             <!-- ko foreach: getRegion('messages') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
 
-
             <fieldset
                     data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
                 <!-- ko if: (isShowLegend())-->
@@ -94,7 +90,6 @@
                     </div>
                 </div>
 
-
                 <!-- ko if: (hasInstallments())-->
 
                 <div class="field required"
@@ -119,7 +114,6 @@
                     </div>
                 </div>
 
-
                 <!-- /ko -->
             </fieldset>
 
@@ -145,4 +139,3 @@
     </div>
 </div>
 <!--/ko-->
-