split logic, revert BIC

Author: engcom-Charlie

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Details.php

@@ -5,11 +5,14 @@
  */
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Bulk;
 
-use Magento\AsynchronousOperations\Model\AccessManager;
-use Magento\Framework\View\Result\PageFactory;
-use Magento\Backend\App\Action\Context;
+use Magento\AsynchronousOperations\Model\AccessValidator;
+use Magento\AsynchronousOperations\Model\IsAllowedForBulkUuid;
 use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Class View Operation Details Controller
@@ -22,32 +25,40 @@ class Details extends Action implements HttpGetActionInterface
     private $resultPageFactory;
 
     /**
-     * @var AccessManager
+     * @var AccessValidator
+     * @deprecated
      */
-    private $accessManager;
+    private $accessValidator;
 
     /**
      * @var string
      */
     private $menuId;
 
     /**
-     * Details constructor.
-     *
+     * @var IsAllowedForBulkUuid
+     */
+    private $isAllowedForBulkUuid;
+
+    /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @param AccessManager $accessManager
+     * @param AccessValidator $accessValidator
      * @param string $menuId
+     * @param IsAllowedForBulkUuid|null $isAllowedForBulkUuid
      */
     public function __construct(
         Context $context,
         PageFactory $resultPageFactory,
-        AccessManager $accessManager,
-        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
+        AccessValidator $accessValidator,
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations',
+        ?IsAllowedForBulkUuid $isAllowedForBulkUuid = null
     ) {
         $this->resultPageFactory = $resultPageFactory;
-        $this->accessManager = $accessManager;
+        $this->accessValidator = $accessValidator;
         $this->menuId = $menuId;
+        $this->isAllowedForBulkUuid = $isAllowedForBulkUuid
+            ?: ObjectManager::getInstance()->get(IsAllowedForBulkUuid::class);
         parent::__construct($context);
     }
 
@@ -56,13 +67,13 @@ public function __construct(
      */
     protected function _isAllowed()
     {
-        return $this->accessManager->isAllowedForBulkUuid($this->getRequest()->getParam('uuid'));
+        return $this->isAllowedForBulkUuid->execute($this->getRequest()->getParam('uuid'));
     }
 
     /**
      * Bulk details action
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return Page
      */
     public function execute()
     {

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Bulk/Retry.php

@@ -7,12 +7,15 @@
 
 use Magento\AsynchronousOperations\Model\BulkManagement;
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
+use Magento\AsynchronousOperations\Model\IsAllowedForBulkUuid;
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Backend\App\Action;
-use Magento\AsynchronousOperations\Model\AccessManager;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\AsynchronousOperations\Model\AccessValidator;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Bulk\GetBulksByUserAndTypeInterface;
+use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Bulk Retry Controller
@@ -30,36 +33,43 @@ class Retry extends Action implements HttpPostActionInterface
     private $notificationManagement;
 
     /**
-     * @var AccessManager
+     * @var AccessValidator
+     */
+    private $accessValidator;
+
+    /**
+     * @var IsAllowedForBulkUuid
      */
-    private $accessManager;
+    private $isAllowedForBulkUuid;
 
     /**
-     * Retry constructor.
-     *
      * @param Context $context
      * @param BulkManagement $bulkManagement
      * @param BulkNotificationManagement $notificationManagement
-     * @param AccessManager $accessManager
+     * @param AccessValidator $accessValidator
+     * @param IsAllowedForBulkUuid|null $isAllowedForBulkUuid
      */
     public function __construct(
         Context $context,
         BulkManagement $bulkManagement,
         BulkNotificationManagement $notificationManagement,
-        AccessManager $accessManager
+        AccessValidator $accessValidator,
+        ?IsAllowedForBulkUuid $isAllowedForBulkUuid = null
     ) {
         parent::__construct($context);
         $this->bulkManagement = $bulkManagement;
         $this->notificationManagement = $notificationManagement;
-        $this->accessManager = $accessManager;
+        $this->accessValidator = $accessValidator;
+        $this->isAllowedForBulkUuid = $isAllowedForBulkUuid
+            ?: ObjectManager::getInstance()->get(IsAllowedForBulkUuid::class);
     }
 
     /**
      * @inheritDoc
      */
     protected function _isAllowed()
     {
-        return $this->accessManager->isAllowedForBulkUuid($this->getRequest()->getParam('uuid'));
+        return $this->isAllowedForBulkUuid->execute($this->getRequest()->getParam('uuid'));
     }
 
     /**

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Index/Index.php

@@ -6,51 +6,41 @@
 
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\View\Result\Page;
-use Magento\AsynchronousOperations\Model\AccessManager;
-use Magento\Backend\App\Action;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use \Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\View\Result\PageFactory;
 
 class Index extends Action implements HttpGetActionInterface
 {
-    public const BULK_OPERATIONS_MENU_ID = "Magento_AsynchronousOperations::system_magento_logging_bulk_operations";
+    public const ADMIN_RESOURCE = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
 
     /**
      * @var PageFactory
      */
     private $resultPageFactory;
 
     /**
-     * @var AccessManager
+     * @var string
      */
-    private $accessManager;
+    private $menuId;
 
     /**
-     * Details constructor.
      * @param Context $context
      * @param PageFactory $resultPageFactory
-     * @param AccessManager $accessManager
+     * @param string $menuId
      */
     public function __construct(
         Context $context,
         PageFactory $resultPageFactory,
-        AccessManager $accessManager
+        $menuId = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations'
     ) {
         $this->resultPageFactory = $resultPageFactory;
-        $this->accessManager = $accessManager;
+        $this->menuId = $menuId;
         parent::__construct($context);
     }
 
-    /**
-     * @inheritDoc
-     */
-    protected function _isAllowed()
-    {
-        return $this->accessManager->isOwnActionsAllowed();
-    }
-
     /**
      * Bulk list action
      *
@@ -60,7 +50,7 @@ public function execute()
     {
         $resultPage = $this->resultPageFactory->create();
         $resultPage->initLayout();
-        $this->_setActiveMenu(self::BULK_OPERATIONS_MENU_ID);
+        $this->_setActiveMenu($this->menuId);
         $resultPage->getConfig()->getTitle()->prepend(__('Bulk Actions Log'));
         return $resultPage;
     }

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php

@@ -6,50 +6,32 @@
 namespace Magento\AsynchronousOperations\Controller\Adminhtml\Notification;
 
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
-use Magento\Backend\App\Action\Context;
 use Magento\Backend\App\Action;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\AsynchronousOperations\Model\AccessManager;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Bulk Notification Dismiss Controller
  */
 class Dismiss extends Action implements HttpGetActionInterface
 {
+    public const ADMIN_RESOURCE = 'Magento_AsynchronousOperations::system_magento_logging_bulk_operations';
+
     /**
      * @var BulkNotificationManagement
      */
     private $notificationManagement;
 
     /**
-     * @var AccessManager
-     */
-    private $accessManager;
-
-    /**
-     * Class constructor.
-     *
      * @param Context $context
      * @param BulkNotificationManagement $notificationManagement
-     * @param AccessManager $accessManager
      */
-    public function __construct(
-        Context $context,
-        BulkNotificationManagement $notificationManagement,
-        AccessManager $accessManager
-    ) {
+    public function __construct(Context $context, BulkNotificationManagement $notificationManagement)
+    {
         parent::__construct($context);
         $this->notificationManagement = $notificationManagement;
-        $this->accessManager = $accessManager;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _isAllowed()
-    {
-        return $this->accessManager->isOwnActionsAllowed();
     }
 
     /**
@@ -64,7 +46,7 @@ public function execute()
 
         $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
 
-        /** @var \Magento\Framework\Controller\Result\Json $result */
+        /** @var Json $result */
         $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         if (!$isAcknowledged) {
             $result->setHttpResponseCode(400);