feat(policy): redesign use TLS policy

Signed-off-by: Thierry Bugier <[email protected]>

Author: btry

inc/agent.class.php

@@ -1475,7 +1475,7 @@ public function cleanupSubtopics() {
    /**
     * list of topics to cleanup on unenrollment or on enrollment
     *
-    * @return string[]
+    * @return array
     */
    public static function getTopicsToCleanup() {
       $policy = new PluginFlyvemdmPolicy();

inc/policybase.class.php

@@ -69,7 +69,7 @@ abstract class PluginFlyvemdmPolicyBase implements PluginFlyvemdmPolicyInterface
    protected $specificStatuses = [];
 
     /**
-     * get common task statuses
+     * Gets common task statuses
      *
      * @return array
      */
@@ -90,7 +90,7 @@ public static final function getEnumBaseTaskStatus() {
    }
 
     /**
-     * get specific task statuses
+     * Gets specific task statuses
      * To be overriden in child class
      *
      * @return array
@@ -117,9 +117,9 @@ public function __construct(PluginFlyvemdmPolicy $policy) {
    protected function jsonDecodeProperties($properties, array $defaultProperties) {
       if (empty($properties)) {
          return $defaultProperties;
-      } else {
-         $propertyCollection = json_decode($properties, true);
       }
+
+      $propertyCollection = json_decode($properties, true);
       if (empty($propertyCollection)) {
          return $defaultProperties;
       }

inc/policydeployapplication.class.php

@@ -91,6 +91,7 @@ public function integrityCheck($value, $itemtype, $itemId) {
     * @param mixed $value
     * @param mixed $itemtype
     * @param integer $itemId
+    *
     * @return array|boolean
     */
    public function getMqttMessage($value, $itemtype, $itemId) {

inc/policyfactory.class.php

@@ -79,6 +79,10 @@ public function createFromPolicy(PluginFlyvemdmPolicy $policyData) {
             $policy = new PluginFlyvemdmPolicyRemovefile($policyData);
             break;
 
+         case 'm2m':
+            $policy = new PluginFlyvemdmPolicyM2m($policyData);
+            break;
+
          default:
             return null;
       }

inc/policyinteger.class.php

@@ -72,6 +72,7 @@ public function __construct(PluginFlyvemdmPolicy $policy) {
     * @param mixed $value
     * @param mixed $itemtype
     * @param integer $itemId
+    *
     * @return bool
     */
    public function integrityCheck($value, $itemtype, $itemId) {

install/policies/mdm.php

@@ -36,16 +36,21 @@
 $category = 'Mobile Device Management';
 return [
    [
-      'name'                                => __('use TLS', 'flyvemdm'),
-      'symbol'                              => 'useTLS',
+      'name'                                => __('messenging server', 'flyvemdm'),
+      'symbol'                              => 'm2m',
       'group'                               => 'MDM',
-      'type'                                => 'bool',
+      'type'                                => 'm2m',
       'type_data'                           => '',
       'unicity'                             => 1,
       'plugin_flyvemdm_policycategories_id' => $category,
-      'comment'                             => __('use TLS', 'flyvemdm'),
+      'comment'                             => __('messenging server', 'flyvemdm'),
       'default_value'                       => '',
-      'recommended_value'                   => '',
+      'recommended_value'                   => json_encode(
+         [
+            'server' => '',
+            'port'   => '0',
+            'tls'    => '1'
+         ]),
       'is_android_policy'                   => '1',
       'is_android_system'                   => '0',
       'is_apple_policy'                     => '0',

tests/src/Flyvemdm/Tests/CommonTestCase.php

@@ -520,7 +520,7 @@ public static function policyList() {
          'Policy/removeFile',
          'Policy/disableWifi',
          'Policy/disableBluetooth',
-         'Policy/useTLS',
+         'Policy/m2m',
          'Policy/disableRoaming',
          'Policy/disableGPS',
          'Policy/disableUsbMtp',