feat(policy): show policy restrictions for android

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
flyve-mdm · Aug 30, 2018 · bbb9e09 · bbb9e09
1 parent b6e591c
commit bbb9e09
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 30 deletions.
diff --git a/ajax/policyValue.php b/ajax/policyValue.php
@@ -48,7 +48,6 @@
 $policy = $factory->createFromDBByID($policyId);
 if ($policy !== null) {
    echo $policy->formGenerator($mode, [
-      'policyId' => $policyId,
       'task'  => (int) ((isset($_POST['task'])) ? $_POST['task'] : 0),
       'itemtype_applied' => ((isset($_POST['itemtype_applied'])) ? $_POST['itemtype_applied'] : ''),
       'items_id_applied' => (int) ((isset($_POST['items_id_applied'])) ? $_POST['items_id_applied'] : 0),

diff --git a/inc/policybase.class.php b/inc/policybase.class.php
@@ -195,6 +195,7 @@ public function showValueInput($value = '', $itemType = '', $itemId = 0) {
       $data['itemtype'] = $itemType;
       $data['value'] = $value;
       $data['typeTmpl'] = PluginFlyvemdmPolicyBase::class;
+      $data['android_requirements'] = $this->getAndroidCompatibilityMessage();
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_value.html.twig', ['data' => $data]);
    }
@@ -252,13 +253,13 @@ public function formGenerator(
       }
       $form = [
          'mode' => $mode,
-         'input' => $this->showValueInput($value, $itemtype, $itemId)
+         'input' => $this->showValueInput($value, $itemtype, $itemId),
       ];
       if ($mode == "update") {
          $form['url'] = Toolbox::getItemTypeFormURL(PluginFlyvemdmTask::class);
          $form['rand'] = mt_rand();
          $form['taskId'] = $_input['task'];
-         $form['policyId'] = $_input['policyId'];
+         $form['policyId'] = $this->policyData->getID();
          $form['itemtype_applied'] = $_input['itemtype_applied'];
          $form['items_id_applied'] = $_input['items_id_applied'];
          $form['_csrf'] = (GLPI_USE_CSRF_CHECK) ? Html::hidden('_glpi_csrf_token',
@@ -267,4 +268,34 @@ public function formGenerator(
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_form.html.twig', ['form' => $form]);
    }
+
+   protected function getAndroidCompatibilityMessage() {
+      $min = $this->policyData->getField('android_min_version');
+      $max = $this->policyData->getField('android_max_version');
+
+      $message = '';
+      if ($min == '0' && $max != '0') {
+         $message = sprintf(
+            __('Compatibility with Android up to %1$s.', 'flyvemdm'),
+            $max
+         );
+      }
+      if ($min != '0' && $max == '0') {
+         $message = sprintf(
+            __('Compatibility with Android from %1$s.', 'flyvemdm'),
+            $min
+         );
+      }
+      if ($min != '0' && $max != '0') {
+         $message = sprintf(
+            __('Compatibility with Android %1$s to %2$s.', 'flyvemdm'),
+            $min,
+            $max
+         );
+      }
+      if ($this->policyData->getField('is_android_system') != '0') {
+         $message .= ' ' . sprintf('Requires system privileges.', 'flyvemdm');
+      }
+      return $message;
+   }
 }
diff --git a/inc/policyboolean.class.php b/inc/policyboolean.class.php
@@ -82,18 +82,13 @@ public function getMqttMessage($value, $itemtype, $itemId) {
       return $array;
    }
 
-   /**
-    * @param string $value
-    * @param string $itemType
-    * @param int $itemId
-    * @return int|string
-    */
    public function showValueInput($value = '', $itemType = '', $itemId = 0) {
       $data['itemtype'] = $itemType;
       $data['typeTmpl'] = PluginFlyvemdmPolicyBoolean::class;
       $data['dropdown'] = [
           Dropdown::showYesNo('value', $value, -1, ['display' => false])
       ];
+      $data['android_requirements'] = $this->getAndroidCompatibilityMessage();
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_value.html.twig', ['data' => $data]);
    }

diff --git a/inc/policydeployapplication.class.php b/inc/policydeployapplication.class.php
@@ -249,6 +249,7 @@ public function showValueInput($value = '', $itemType = '', $itemId = 0) {
                ]),
             Dropdown::showYesNo('value[remove_on_delete]', $removeOnDelete, -1, ['display' => false])
       ];
+      $data['android_requirements'] = $this->getAndroidCompatibilityMessage();
 
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_value.html.twig', ['data' => $data]);

diff --git a/inc/policydeployfile.class.php b/inc/policydeployfile.class.php
@@ -258,12 +258,6 @@ public function post_unapply($value, $itemtype, $itemId, PluginFlyvemdmNotifiabl
       $task->add($this->postUnapplyTask);
    }
 
-   /**
-    * @param string $value
-    * @param string $itemType
-    * @param int $itemId
-    * @return string|void
-    */
    public function showValueInput($value = '', $itemType = '', $itemId = 0) {
       $itemtype = PluginFlyvemdmFile::class;
       $removeOnDelete = 1;
@@ -297,6 +291,7 @@ public function showValueInput($value = '', $itemType = '', $itemId = 0) {
             ]),
             Dropdown::showYesNo('value[remove_on_delete]', $removeOnDelete, -1, ['display' => false])
       ];
+      $data['android_requirements'] = $this->getAndroidCompatibilityMessage();
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_value.html.twig', ['data' => $data]);
    }

diff --git a/inc/policydropdown.class.php b/inc/policydropdown.class.php
@@ -95,18 +95,13 @@ public function translateData() {
       return $translated;
    }
 
-   /**
-    * @param string $value
-    * @param string $itemType
-    * @param int $itemId
-    * @return int|string
-    */
    public function showValueInput($value = '', $itemType = '', $itemId = 0) {
       $data['itemtype'] = $itemType;
       $data['typeTmpl'] = PluginFlyvemdmPolicyDropdown::class;
       $data['dropdown'] = [
           Dropdown::showFromArray('value', $this->valueList, ['display' => false, 'value' => $value])
       ];
+      $data['android_requirements'] = $this->getAndroidCompatibilityMessage();
       $twig = plugin_flyvemdm_getTemplateEngine();
       return $twig->render('policy_value.html.twig', ['data' => $data]);
    }

diff --git a/tests/suite-unit/PluginFlyvemdmPolicyBase.php b/tests/suite-unit/PluginFlyvemdmPolicyBase.php
@@ -37,12 +37,23 @@ class PluginFlyvemdmPolicyBase extends CommonTestCase {
 
    private $dataField = [];
 
+   public function beforeTestMethod($method) {
+      parent::beforeTestMethod($method);
+      switch ($method) {
+         case 'testFormGenerator':
+            $this->login('glpi', 'glpi');
+            break;
+      }
+   }
+
    /**
     * @return array
     */
-   private function createNewPolicyInstance() {
+   private function createNewPolicyInstance($symbol = null) {
       $policyData = new \PluginFlyvemdmPolicy();
-      $policyData->fields = $this->dataField;
+      if ($symbol !== null) {
+         $policyData->getFromDbBySymbol($symbol);
+      }
       $policy = $this->newTestedInstance($policyData);
       return [$policy, $policyData];
    }
@@ -126,6 +137,7 @@ public function testShowValueInput() {
       $data['itemtype'] = '';
       $data['value'] = '';
       $data['typeTmpl'] = \PluginFlyvemdmPolicyBase::class;
+      $data['android_requirements'] = 'Compatibility with Android N/A to N/A. Requires system privileges.';
       $twig = plugin_flyvemdm_getTemplateEngine();
       $this->string($policy->showValueInput())->isEqualTo($twig->render('policy_value.html.twig', ['data' => $data]));
    }
@@ -204,8 +216,6 @@ public function providerFilterStatus() {
     * @tags testFormGenerator
     */
    public function testFormGenerator() {
-      $this->login('glpi', 'glpi');
-
       $existingPolicy = new \PluginFlyvemdmPolicy();
       $existingPolicy->getFromDbBySymbol('storageEncryption');
       $fleet = $this->createFleet(['name' => $this->getUniqueString()]);
@@ -221,10 +231,9 @@ public function testFormGenerator() {
          'items_id' => '',
       ]);
 
-      list($policy) = $this->createNewPolicyInstance();
+      list($policy) = $this->createNewPolicyInstance($existingPolicy->getField('symbol'));
       // add action
       $html = $policy->formGenerator('add', [
-         'policyId'         => $policyId,
          'task'             => 0,
          'itemtype_applied' => '',
          'items_id_applied' => 0,
@@ -236,7 +245,6 @@ public function testFormGenerator() {
       // edit action
       $taskId = $task->getID();
       $html = $policy->formGenerator('update', [
-         'policyId'         => $policyId,
          'task'             => $taskId,
          'itemtype_applied' => 'fleet',
          'items_id_applied' => $fleetId,

diff --git a/tpl/fleet_policy.html.twig b/tpl/fleet_policy.html.twig
@@ -16,6 +16,13 @@
          <div id="plugin_flyvemdm_policy_value"></div>
          </td>
       </tr>
+      <tr>
+         <td colspan="2">
+          <span id="plugin_flyvemdm_policy_android_requirements"></span>
+          <br>
+          <!-- <span id="plugin_flyvemdm_policy_ios_requirements"></span> -->
+        </td>
+      </tr>
       <tr>
          <td colspan="2" class="center">
             <input type="hidden" name="itemtype_applied" value="{{ task.itemtype_applied }}">
@@ -62,7 +69,6 @@
          <th>{{ __('Policy', 'flyvemdm') }}</th>
          <th>{{ __('Value', 'flyvemdm') }}</th>
       </tr>
-
    </table>
    {% if canEdit %}
      {{ massiveActionForm.end|raw }}

diff --git a/tpl/policy_value.html.twig b/tpl/policy_value.html.twig
@@ -72,4 +72,7 @@
     <script type="text/javascript">
        $(document).find(editorId).dialog("option", "width", 200);
     </script>
-{% endif %}
+{% endif %}
+<script type="text/javascript">
+   $(document).find('#plugin_flyvemdm_policy_android_requirements')[0].innerText = "{{ data.android_requirements }}";
+</script>