Merge pull request #8863 from magento-gl/spartans_pr_29032024_AC-11661

[Spartans] Bugfix Delivery

Author: sidolov

app/code/Magento/Config/Console/Command/ConfigShowCommand.php

@@ -238,7 +238,7 @@ private function outputResult(OutputInterface $output, $configValue, $configPath
     {
         if (!is_array($configValue)) {
             $value = $this->valueProcessor->process($this->scope, $this->scopeCode, $configValue, $configPath);
-            $output->writeln($this->inputPath === $configPath ? $value : sprintf("%s - %s", $configPath, $value));
+            $output->writeln($this->inputPath === $configPath ? [$value] : sprintf("%s - %s", $configPath, $value));
         } elseif (is_array($configValue)) {
             foreach ($configValue as $name => $value) {
                 $childPath = empty($configPath) ? $name : ($configPath . '/' . $name);

app/code/Magento/Quote/Plugin/ValidateQuoteOrigOrder.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Quote\Plugin;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Webapi\Rest\Request as RestRequest;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * Validate order id from request param
+ */
+class ValidateQuoteOrigOrder
+{
+    /**
+     * @var OrderRepositoryInterface|null
+     */
+    private $orderRepository;
+
+    /**
+     * @var RestRequest $request
+     */
+    private $request;
+
+    /**
+     * @param RestRequest $request
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(RestRequest $request, OrderRepositoryInterface $orderRepository)
+    {
+        $this->request = $request;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * Validate the user authorization to order
+     *
+     * @param CartRepositoryInterface $cartRepository
+     * @param CartInterface $quote
+     * @return void
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(
+        CartRepositoryInterface $cartRepository,
+        CartInterface $quote
+    ): void {
+        $params = $this->request->getBodyParams();
+        if (!empty($params) && isset($params['quote']['orig_order_id'])) {
+            $orderId = $params['quote']['orig_order_id'];
+            try {
+                $order = $this->orderRepository->get($orderId);
+                $orderCustomer = (int)$order->getCustomerId();
+                if ($quote->getCustomerId() !== $orderCustomer) {
+                    throw new NoSuchEntityException(__('Please check input parameters.'));
+                }
+            } catch (\Exception $e) {
+                throw new NoSuchEntityException(__('Please check input parameters.'), $e);
+            }
+        }
+    }
+}

app/code/Magento/Quote/etc/webapi_rest/di.xml

@@ -22,4 +22,7 @@
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <plugin name="validateQuoteData" type="Magento\Quote\Plugin\Webapi\Controller\Rest\ValidateQuoteData" sortOrder="1" disabled="false" />
     </type>
+    <type name="Magento\Quote\Api\CartRepositoryInterface">
+        <plugin name="quoteValidateOrderId" type="Magento\Quote\Plugin\ValidateQuoteOrigOrder"/>
+    </type>
 </config>