[ECP-9723] Fix failing recurring payments in the absence of stateData and add missing command executors for vault authorization (#3127)

* [ECP-9723] Add missing command executors for vault payments

* [ECP-9723] Remove unused commandPool definitions in vault facade declarations

* [ECP-9723] Add missing paymentMethod details in the absence of stateData

* [ECP-9723] Sort the executors in alphabetical order

Author: candemiralp

Gateway/Request/RecurringVaultDataBuilder.php

@@ -52,20 +52,11 @@ public function build(array $buildSubject): array
         $paymentToken = $extensionAttributes->getVaultPaymentToken();
         $details = json_decode((string) ($paymentToken->getTokenDetails() ?: '{}'), true);
 
-        if ($paymentToken->getType() === PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD) {
-            // Build base request for card token payments (including card wallets)
-
-            $isInstantPurchase = (bool) $payment->getAdditionalInformation('instant-purchase');
-
-            if ($isInstantPurchase) {
-                // `Instant Purchase` doesn't have the component and state data. Build the `paymentMethod` object.
-                $requestBody['paymentMethod']['type'] = 'scheme';
-                $requestBody['paymentMethod']['storedPaymentMethodId'] = $paymentToken->getGatewayToken();
-            } else {
-                // Initialize the request body with the current state data if it's not `Instant Purchase`.
-                $requestBody = $this->stateData->getStateData($order->getQuoteId());
-            }
+        // Initialize the request body with the current state data
+        $requestBody = $this->stateData->getStateData($order->getQuoteId());
 
+        // Build base request for card token payments (including card wallets)
+        if ($paymentToken->getType() === PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD) {
             /*
              * `allow3DS: true` flag is required to trigger the native 3DS challenge.
              * Otherwise, shopper will be redirected to the issuer for challenge.
@@ -78,13 +69,21 @@ public function build(array $buildSubject): array
 
             // Due to new VISA compliance requirements, holderName is added to the payments call
             $requestBody['paymentMethod']['holderName'] = $details['cardHolderName'] ?? null;
-        }  else {
-            // Build base request for alternative payment methods for regular checkout and Instant Purchase
+        }
 
-            $requestBody['paymentMethod'] = [
-                'type' => $details['type'],
-                'storedPaymentMethodId' => $paymentToken->getGatewayToken()
-            ];
+        /*
+         * `paymentMethod.type` and `paymentMethod.storedPaymentMethodId` need to be manually populated
+         * for all recurring alternative payment methods, recurring card payments where state data is missing and
+         * `Instant Purchase` payments.
+         */
+        if (empty($requestBody['paymentMethod']['type'])) {
+            $requestBody['paymentMethod']['type'] =
+                $paymentToken->getType() === PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD
+                    ? 'scheme'
+                    : $details['type'];
+        }
+        if (empty($requestBody['paymentMethod']['storedPaymentMethodId'])) {
+            $requestBody['paymentMethod']['storedPaymentMethodId'] = $paymentToken->getGatewayToken();
         }
 
         // Check the `stateData` if `recurringProcessingModel` is added through a headless request.