fix(policies): update code for deploy and remove applications

Signed-off-by: Domingo Oropeza <doropeza@teclib.com>

inc/policybase.class.php

@@ -39,7 +39,12 @@
 abstract class PluginFlyvemdmPolicyBase implements PluginFlyvemdmPolicyInterface {
 
    /**
-    * @var bool $unicityRequired if true The policy cannot be applied more than once to a fleet
+    * @var bool $canApply if true the policy can be applied
+    */
+   protected $canApply = true;
+
+   /**
+    * @var bool $unicityRequired if true the policy cannot be applied more than once to a fleet
     */
    protected $unicityRequired = true;
 
@@ -122,7 +127,7 @@ protected function jsonDecodeProperties($properties, array $defaultProperties) {
     * @return bool
     */
    public function canApply(PluginFlyvemdmFleet $fleet, $value, $itemtype, $itemId) {
-      return true;
+      return $this->canApply;
    }
 
    /**

inc/policydeployapplication.class.php

@@ -118,7 +118,8 @@ public function unicityCheck($value, $itemtype, $itemId, PluginFlyvemdmFleet $fl
       $fleetId = $fleet->getID();
       $task = new PluginFlyvemdmTask();
       $rows = $task->find("`plugin_flyvemdm_fleets_id` = '$fleetId'
-            AND `itemtype` = '$itemtype' AND `items_id` = '$itemId'", '', '1');
+            AND `plugin_flyvemdm_policies_id` = '" . $this->policyData->getID() . "' 
+            AND `items_id` = '$itemId'", '', '1');
       if (count($rows) > 0) {
          return false;
       }
@@ -195,7 +196,7 @@ public function unapply(PluginFlyvemdmFleet $fleet, $value, $itemtype, $itemId)
       if ($package->getFromDB($itemId)) {
          $policyFactory = new PluginFlyvemdmPolicyFactory();
          $removeApp = $policyFactory->createFromPolicy($policyData);
-         $removeApp->apply($fleet, '', $package, $itemId);
+         $removeApp->apply($fleet, $package->getField('package_name'), '', 0);
       }
 
       return true;

inc/policyremoveapplication.class.php

@@ -79,7 +79,8 @@ public function unicityCheck($value, $itemtype, $itemId, PluginFlyvemdmFleet $fl
       $fleetId = $fleet->getID();
       $task = new PluginFlyvemdmTask();
       $rows = $task->find("`plugin_flyvemdm_fleets_id` = '$fleetId'
-            AND `itemtype` = '' AND `items_id` = '0' AND `value` = '$value'", "", "1");
+            AND `plugin_flyvemdm_policies_id` = '" . $this->policyData->getID() . "' 
+            AND `value` = '$value'", "", "1");
       return (count($rows) == 0);
    }
 
@@ -90,12 +91,12 @@ public function unicityCheck($value, $itemtype, $itemId, PluginFlyvemdmFleet $fl
     * @return array|bool
     */
    public function getMqttMessage($value, $itemtype, $itemId) {
-      if (! $this->integrityCheck($value, $itemtype, $itemId)) {
+      if (!$this->integrityCheck($value, $itemtype, $itemId)) {
          return false;
       }
 
       $array = [
-            $this->symbol  => $value
+         $this->symbol  => $value,
       ];
       return $array;
    }
@@ -108,41 +109,18 @@ public function getMqttMessage($value, $itemtype, $itemId) {
     * @return bool
     */
    public function apply(PluginFlyvemdmFleet $fleet, $value, $itemtype, $itemId) {
-      // force the itemtype for packages
-      if (!($itemtype instanceof PluginFlyvemdmPackage)) {
-         $itemtype = new PluginFlyvemdmPackage();
-      }
-
-      // the itemId wasn't send and the itemtype is new
-      if ($itemtype->isNewItem() && !$itemId) {
-         Session::addMessageAfterRedirect(__('An application ID is required', 'flyvemdm'),
-            false, ERROR);
-         return false;
-      }
-
-      // the itemid is send but the itemtype is new, lest's try to load the info of the package
-      if ($itemtype->isNewItem() && $itemId) {
-         if (!$itemtype->getFromDB($itemId)) {
-            Session::addMessageAfterRedirect(__('The application does not exists', 'flyvemdm'),
-               false, ERROR);
-            return false;
-         }
-      }
+      $this->canApply = false;
 
-      // the package is loaded, let's create the task
-      $packageName = $itemtype->getField('package_name');
-      $packageName = ($packageName) ? $packageName : $itemtype->getField('name');
-      $value = json_encode(['package' => $packageName, 'id' => $itemtype->getID()]);
       $task = new PluginFlyvemdmTask();
       if (!$task->add([
          'plugin_flyvemdm_fleets_id'   => $fleet->getID(),
          'plugin_flyvemdm_policies_id' => $this->getPolicyData()->getID(),
          'value'                       => $value,
-         '_silent'                     => true,
       ])) {
          return false;
       }
 
+      $this->canApply = true;
       return true;
    }
 

inc/task.class.php

@@ -224,13 +224,6 @@ public function prepareInputForAdd($input) {
          return false;
       }
 
-      if (!$this->policy->apply($this->fleet, $input['value'], $input['itemtype'],
-         $input['items_id'])) {
-         Session::addMessageAfterRedirect(__('Failed to apply the policy', 'flyvemdm'), false,
-            ERROR);
-         return false;
-      }
-
       return $input;
    }