Merge pull request #60 from mooore-digital/develop

Develop

Author: GrimLink

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.4] - 2021-09-02
+### Fixed
+- Potential security issue with path-parse from @wordpress/block-library #57
+- Detach Wordpress page does not work #49
+
 ## [0.8.3] - 2021-05-03
 ### Fixed
 - Fixed embedded videos not being properly sized by aspect ratio

Observer/Adminhtml/PageDetacher.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Mooore\WordpressIntegrationCms\Observer\Adminhtml;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Mooore\WordpressIntegrationCms\Model\Config;
+use Mooore\WordpressIntegrationCms\Model\RemotePageRepository;
+
+/**
+ * This Observer class sets the Wordpress page ID to NULL when the page has been detached and updates the record in the
+ * Wordpress environment appropriately.
+ *
+ * @class PageDetacher
+ */
+class PageDetacher implements ObserverInterface
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var RemotePageRepository
+     */
+    private $remotePageRepository;
+
+    public function __construct(RemotePageRepository $remotePageRepository, Config $config)
+    {
+        $this->remotePageRepository = $remotePageRepository;
+        $this->config = $config;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        $page = $observer->getData('page');
+        if (!array_key_exists('wordpress_page_id', $observer->getData('page')->getData())) {
+            $page->setData('wordpress_page_id', null);
+            $wordpressSiteAndPageId = $page->getOrigData('wordpress_page_id');
+            if (!$this->config->magentoUrlPushBackEnabled() || !$wordpressSiteAndPageId) {
+                return;
+            }
+
+            $explodedWordpressSiteAndPageId = explode('_', $page->getOrigData('wordpress_page_id'));
+            try {
+                $this->remotePageRepository->postMetaData(
+                    (int) $explodedWordpressSiteAndPageId[0],
+                    (int) $explodedWordpressSiteAndPageId[1],
+                    'mooore_magento_cms_url',
+                    ''
+                );
+            } catch (LocalizedException $exception) {
+                $this->messageManager->addErrorMessage($exception->getMessage());
+                return;
+            }
+        }
+    }
+}

etc/adminhtml/events.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="cms_page_prepare_save">
+        <observer instance="Mooore\WordpressIntegrationCms\Observer\Adminhtml\PageDetacher"
+                  name="mooore_pagedetacher"/>
+    </event>
+</config>