LYNX-568: Request order token for guest order cancellation

Author: deepak-soni1

app/code/Magento/OrderCancellationGraphQl/Model/CancelOrderGuest.php

@@ -17,32 +17,25 @@
 namespace Magento\OrderCancellationGraphQl\Model;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\OrderCancellation\Model\Email\ConfirmationKeySender;
 use Magento\OrderCancellation\Model\GetConfirmationKey;
-use Magento\OrderCancellationGraphQl\Model\Validator\GuestOrder\ValidateRequest;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\SalesGraphQl\Model\Formatter\Order as OrderFormatter;
 
-/**
- * Class for Guest order cancellation
- */
 class CancelOrderGuest
 {
     /**
      * CancelOrderGuest Constructor
      *
      * @param OrderFormatter $orderFormatter
      * @param OrderRepositoryInterface $orderRepository
-     * @param ValidateRequest $validateRequest
      * @param ConfirmationKeySender $confirmationKeySender
      * @param GetConfirmationKey $confirmationKey
      */
     public function __construct(
         private readonly OrderFormatter           $orderFormatter,
         private readonly OrderRepositoryInterface $orderRepository,
-        private readonly ValidateRequest          $validateRequest,
         private readonly ConfirmationKeySender    $confirmationKeySender,
         private readonly GetConfirmationKey       $confirmationKey,
     ) {
@@ -54,13 +47,9 @@ public function __construct(
      * @param Order $order
      * @param array $input
      * @return array
-     * @throws GraphQlInputException
-     * @throws LocalizedException
      */
     public function execute(Order $order, array $input): array
     {
-        $this->validateRequest->validateCancelGuestOrderInput($input);
-
         try {
             // send confirmation key and order id
             $this->sendConfirmationKeyEmail($order, $input['reason']);

app/code/Magento/OrderCancellationGraphQl/Model/ConfirmCancelOrderGuest.php renamed to app/code/Magento/OrderCancellationGraphQl/Model/ConfirmCancelOrder.php

@@ -19,18 +19,17 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\OrderCancellation\Model\CancelOrder as CancelOrderAction;
-use Magento\OrderCancellation\Model\ResourceModel\SalesOrderConfirmCancel
-    as SalesOrderConfirmCancelResourceModel;
+use Magento\OrderCancellation\Model\ResourceModel\SalesOrderConfirmCancel as SalesOrderConfirmCancelResourceModel;
 use Magento\Sales\Model\Order;
 use Magento\SalesGraphQl\Model\Formatter\Order as OrderFormatter;
 
 /**
  * Class for Guest order cancellation confirmation
  */
-class ConfirmCancelOrderGuest
+class ConfirmCancelOrder
 {
     /**
-     * ConfirmCancelOrderGuest Constructor
+     * ConfirmCancelOrder Constructor
      *
      * @param OrderFormatter $orderFormatter
      * @param CancelOrderAction $cancelOrderAction

app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrder.php

@@ -18,15 +18,12 @@
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\OrderCancellation\Model\CancelOrder as CancelOrderAction;
-use Magento\OrderCancellation\Model\Config\Config;
-use Magento\OrderCancellationGraphQl\Model\CancelOrderGuest;
-use Magento\OrderCancellationGraphQl\Model\Validator\ValidateCustomer;
 use Magento\OrderCancellationGraphQl\Model\Validator\ValidateOrder;
 use Magento\OrderCancellationGraphQl\Model\Validator\ValidateRequest;
-use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\SalesGraphQl\Model\Formatter\Order as OrderFormatter;
 
@@ -42,20 +39,14 @@ class CancelOrder implements ResolverInterface
      * @param OrderFormatter $orderFormatter
      * @param OrderRepositoryInterface $orderRepository
      * @param CancelOrderAction $cancelOrderAction
-     * @param CancelOrderGuest $cancelOrderGuest
      * @param ValidateOrder $validateOrder
-     * @param ValidateCustomer $validateCustomer
-     * @param Config $config
      */
     public function __construct(
         private readonly ValidateRequest          $validateRequest,
         private readonly OrderFormatter           $orderFormatter,
         private readonly OrderRepositoryInterface $orderRepository,
         private readonly CancelOrderAction        $cancelOrderAction,
-        private readonly CancelOrderGuest         $cancelOrderGuest,
-        private readonly ValidateOrder            $validateOrder,
-        private readonly ValidateCustomer         $validateCustomer,
-        private readonly Config                   $config
+        private readonly ValidateOrder            $validateOrder
     ) {
     }
 
@@ -69,61 +60,30 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $this->validateRequest->execute($args['input'] ?? []);
+        $this->validateRequest->execute($context, $args['input'] ?? []);
 
         try {
             $order = $this->orderRepository->get($args['input']['order_id']);
-            if (!$this->isOrderCancellationEnabled($order)) {
-                return $this->createErrorResponse('Order cancellation is not enabled for requested store.');
+
+            if ((int)$order->getCustomerId() !== $context->getUserId()) {
+                throw new GraphQlAuthorizationException(__('Current user is not authorized to cancel this order'));
             }
 
             $errors = $this->validateOrder->execute($order);
             if ($errors) {
                 return $errors;
             }
 
-            if ($order->getCustomerIsGuest()) {
-                return $this->cancelOrderGuest->execute($order, $args['input']);
-            }
-
-            $this->validateCustomer->execute($order, $context);
-
             $order = $this->cancelOrderAction->execute($order, $args['input']['reason']);
 
             return [
                 'order' => $this->orderFormatter->format($order)
             ];
-        } catch (LocalizedException $e) {
-            return $this->createErrorResponse($e->getMessage());
-        }
-    }
 
-    /**
-     * Create error response
-     *
-     * @param string $message
-     * @param OrderInterface|null $order
-     * @return array
-     * @throws LocalizedException
-     */
-    private function createErrorResponse(string $message, OrderInterface $order = null): array
-    {
-        $response = ['error' => __($message)];
-        if ($order) {
-            $response['order'] = $this->orderFormatter->format($order);
+        } catch (LocalizedException $e) {
+            return [
+                'error' => __($e->getMessage())
+            ];
         }
-
-        return $response;
-    }
-
-    /**
-     * Check if order cancellation is enabled in config
-     *
-     * @param OrderInterface $order
-     * @return bool
-     */
-    private function isOrderCancellationEnabled(OrderInterface $order): bool
-    {
-        return $this->config->isOrderCancellationEnabledForStore((int)$order->getStoreId());
     }
 }

app/code/Magento/OrderCancellationGraphQl/Model/Resolver/ConfirmCancelOrder.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\OrderCancellationGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\OrderCancellationGraphQl\Model\ConfirmCancelOrder as ConfirmCancelOrderGuest;
+use Magento\OrderCancellationGraphQl\Model\Validator\ValidateOrder;
+use Magento\OrderCancellationGraphQl\Model\Validator\ValidateConfirmRequest;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * Cancels a guest order on confirmation
+ */
+class ConfirmCancelOrder implements ResolverInterface
+{
+    /**
+     * ConfirmCancelOrder Constructor
+     *
+     * @param ValidateConfirmRequest $validateRequest
+     * @param OrderRepositoryInterface $orderRepository
+     * @param ConfirmCancelOrderGuest $confirmCancelOrder
+     * @param ValidateOrder $validateOrder
+     */
+    public function __construct(
+        private readonly ValidateConfirmRequest   $validateRequest,
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly ConfirmCancelOrderGuest  $confirmCancelOrder,
+        private readonly ValidateOrder            $validateOrder
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): array {
+        $this->validateRequest->execute($args['input'] ?? []);
+
+        try {
+            $order = $this->orderRepository->get($args['input']['order_id']);
+
+            if (!$order->getCustomerIsGuest()) {
+                return [
+                    'error' => __('Current user is not authorized to cancel this order')
+                ];
+            }
+
+            $errors = $this->validateOrder->execute($order);
+            if (!empty($errors)) {
+                return $errors;
+            }
+
+            return $this->confirmCancelOrder->execute($order, $args['input']);
+        } catch (LocalizedException $e) {
+            return [
+                'error' => __($e->getMessage())
+            ];
+        }
+    }
+}