Merge branch '4.0' into 4.x

Author: bluvulture

composer.json

@@ -21,7 +21,7 @@
     "drewm/mailchimp-api": "^2.2",
     "guzzlehttp/guzzle": "^7.2",
     "knplabs/knp-components": "^4.0",
-    "pear/archive_tar": "^1.4.3",
+    "pear/archive_tar": "^1.4.14",
     "pimcore/newsletter-bundle": "^1.0",
     "pimcore/number-sequence-generator": "^2.0",
     "pimcore/admin-ui-classic-bundle": "^1.0",

doc/26_Webservice.md

@@ -24,10 +24,10 @@ The customers API implements standard REST calls for customer CRUD actions:
 | Path                                                     | Method | Description                 |
 |----------------------------------------------------------|--------|-----------------------------|
 | /__customermanagementframework/webservice/customers      | GET    | Fetch all customers         |
-| /__customermanagementframework/webservice/customers/{id} | GET    | Fetch a single customer     |
+| /__customermanagementframework/webservice/customers/\{id\} | GET    | Fetch a single customer     |
 | /__customermanagementframework/webservice/customers      | POST   | Create a new customer       |
-| /__customermanagementframework/webservice/customers/{id} | PATCH  | Partially update a customer |
-| /__customermanagementframework/webservice/customers/{id} | DELETE | Delete a customer           |
+| /__customermanagementframework/webservice/customers/\{id\} | PATCH  | Partially update a customer |
+| /__customermanagementframework/webservice/customers/\{id\} | DELETE | Delete a customer           |
 
 The `GET` requests can be filtered by passing the following params as query params:
 
@@ -47,10 +47,10 @@ The activities API implements standard REST calls for activity CRUD actions:
 | Path                                                      | Method | Description                   |
 |-----------------------------------------------------------|--------|-------------------------------|
 | /__customermanagementframework/webservice/activities      | GET    | Fetch all activities         |
-| /__customermanagementframework/webservice/activities/{id} | GET    | Fetch a single activity      |
+| /__customermanagementframework/webservice/activities/\{id\} | GET    | Fetch a single activity      |
 | /__customermanagementframework/webservice/activities      | POST   | Create a new activity        |
-| /__customermanagementframework/webservice/activities/{id} | PATCH  | Partially update a activity  |
-| /__customermanagementframework/webservice/activities/{id} | DELETE | Delete a activity            |
+| /__customermanagementframework/webservice/activities/\{id\} | PATCH  | Partially update a activity  |
+| /__customermanagementframework/webservice/activities/\{id\} | DELETE | Delete a activity            |
 
 The `GET` requests can be filtered by passing the following params as query params:
 
@@ -84,10 +84,10 @@ The segments API implements standard REST calls for customer segment CRUD action
 | Path                                                      | Method | Description                   |
 |-----------------------------------------------------------|--------|-------------------------------|
 | /__customermanagementframework/webservice/segments        | GET    | Fetch all segments            |
-| /__customermanagementframework/webservice/segments/{id}   | GET    | Fetch a single segment        |
+| /__customermanagementframework/webservice/segments/\{id\}   | GET    | Fetch a single segment        |
 | /__customermanagementframework/webservice/segments        | POST   | Create a new segment          |
-| /__customermanagementframework/webservice/segments/{id}   | PATCH  | Partially update a segment    |
-| /__customermanagementframework/webservice/segments/{id}   | DELETE | Delete a segment              |
+| /__customermanagementframework/webservice/segments/\{id\}   | PATCH  | Partially update a segment    |
+| /__customermanagementframework/webservice/segments/\{id\}   | DELETE | Delete a segment              |
 
 The `GET` requests can be filtered by passing the follwing params as query params:
 
@@ -103,10 +103,10 @@ The segment groups API implements standard REST calls for customer segment group
 | Path                                                            | Method | Description                           |
 |-----------------------------------------------------------------|--------|---------------------------------------|
 | /__customermanagementframework/webservice/segment-groups        | GET    | Fetch all segment groups              |
-| /__customermanagementframework/webservice/segment-groups/{id}   | GET    | Fetch a single segment group          |
+| /__customermanagementframework/webservice/segment-groups/\{id\}   | GET    | Fetch a single segment group          |
 | /__customermanagementframework/webservice/segment-groups        | POST   | Create a new segment group            |
-| /__customermanagementframework/webservice/segment-groups/{id}   | PATCH  | Partially update a segment group      |
-| /__customermanagementframework/webservice/segment-groups/{id}   | DELETE | Delete a segment group                |
+| /__customermanagementframework/webservice/segment-groups/\{id\}   | PATCH  | Partially update a segment group      |
+| /__customermanagementframework/webservice/segment-groups/\{id\}   | DELETE | Delete a segment group                |
 
 The `GET` requests can be filtered by passing the following params as query params:
 

src/Controller/Admin/DuplicatesController.php

@@ -23,6 +23,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
@@ -35,6 +36,12 @@ public function init()
         AbstractObject::setHideUnpublished(true);
     }
 
+    public function onKernelControllerEvent(ControllerEvent $event): void
+    {
+        parent::onKernelControllerEvent($event);
+        $this->checkPermission('plugin_cmf_perm_customerview');
+    }
+
     /**
      * @Route("/list")
      *

src/Controller/Admin/GDPRDataController.php

@@ -16,22 +16,29 @@
 namespace CustomerManagementFrameworkBundle\Controller\Admin;
 
 use CustomerManagementFrameworkBundle\GDPR\DataProvider\Customers;
+use Pimcore\Controller\KernelControllerEventInterface;
 use Pimcore\Controller\Traits\JsonHelperTrait;
 use Pimcore\Controller\UserAwareController;
 use Pimcore\Model\DataObject\AbstractObject;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class DataObjectController
  *
  * @Route("/gdpr-data")
  */
-class GDPRDataController extends UserAwareController
+class GDPRDataController extends UserAwareController implements KernelControllerEventInterface
 {
     use JsonHelperTrait;
 
+    public function onKernelControllerEvent(ControllerEvent $event): void
+    {
+        $this->checkPermission('gdpr_data_extractor');
+    }
+
     /**
      * @Route("/search-data-objects", name="_pimcore_customermanagementframework_gdprdata_searchdataobjects", methods={"GET"})
      */

src/CustomerSaveManager/DefaultCustomerSaveManager.php

@@ -118,7 +118,7 @@ protected function rememberOriginalCustomer(CustomerInterface $customer)
             }
         }
 
-        if (!$originalCustomerNeeded && $this->getSaveOptions()->isNewsletterQueueEnabled()) {
+        if (!$originalCustomerNeeded && $this->getSaveOptions()->isNewsletterQueueEnabled() && $customer->getId() != null) {
             $originalCustomerNeeded = true;
         }