Updated to handle noroute page

magemaclean · Oct 11, 2019 · 9d442d0 · 9d442d0
1 parent 7359595
commit 9d442d0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -34,16 +34,32 @@ public function canAccessSearch() {
         return !$this->getConfigData('catalog', 'search');
     }
 
-    public function canAccessCmsPage($pageId) {
+    public function canAccessCmsPage($page) {
         $pages = $this->getConfigData('cms', 'pages');
         if($pages && !empty($pages)) {
-            $pageIds = explode(",", $pages);
-            return (in_array($pageId, $pageIds)) ? true : false;
+            $pages = explode(",", $pages);
+            return (in_array($page, $pages)) ? false : true;
         }
 
         return true;
     }
 
+    public function canAccessCmsPageId($pageId) {
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $cmsPage = $objectManager->get('\Magento\Cms\Model\Page');
+        $cmsPage->load($pageId);
+
+        return $this->canAccessCmsPage($cmsPage->getIdentifier());
+    }
+
+    public function getNoroutePage($storeId = null) {
+        return $this->scopeConfig->getValue(
+            'web/default/cms_no_route',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+
     public function getConfigData($group, $field, $storeId = null)
     {
         return $this->scopeConfig->getValue(

diff --git a/Observer/RestrictAccess.php b/Observer/RestrictAccess.php
@@ -45,9 +45,16 @@ public function execute(Observer $observer)
         $request = $observer->getEvent()->getRequest();
         $actionFullName = strtolower($request->getFullActionName());
 
-        if($actionFullName === 'cms_page_view') {
+        if($actionFullName === 'cms_noroute_index') {
+            $noroutePage = $this->_helper->getNoroutePage();
+            if(!$this->_helper->canAccessCmsPage($noroutePage)) {
+                $this->_messageManager->addError($this->_helper->getConfigData("cms", "message"));
+                $this->_response->setRedirect($this->_urlFactory->create()->getUrl('customer/account/login'));
+                return;
+            }
+        } else if($actionFullName === 'cms_page_view') {
             $pageId = $request->getParam('page_id', false);
-            if($pageId && !$this->_helper->canAccessCmsPage($pageId)) {
+            if($pageId && !$this->_helper->canAccessCmsPageId($pageId)) {
                 $this->_messageManager->addError($this->_helper->getConfigData("cms", "message"));
                 $this->_response->setRedirect($this->_urlFactory->create()->getUrl('customer/account/login'));
             }
@@ -81,7 +88,6 @@ public function execute(Observer $observer)
             if (in_array($actionFullName, $restrictRoutes)) {
                 $this->_messageManager->addError($this->_helper->getConfigData("catalog", "message"));
                 $this->_response->setRedirect($this->_urlFactory->create()->getUrl('customer/account/login'));
-                return;
             }
         }
     }