fix(enrollment): fix computer type affectation in enrollment process

flyve-mdm · Nov 23, 2017 · 3306264 · 3306264
1 parent 98555da
commit 3306264
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -1000,12 +1000,12 @@ protected function enrollByInvitationToken($input) {
       $input = [];
 
       $config = Config::getConfigurationValues("flyvemdm", [
-            'mqtt_tls_for_clients',
-            'mqtt_use_client_cert',
-            'debug_noexpire',
-            'computertypes_id',
-            'agentusercategories_id',
-            'agent_profiles_id',
+         'mqtt_tls_for_clients',
+         'mqtt_use_client_cert',
+         'debug_noexpire',
+         'computertypes_id',
+         'agentusercategories_id',
+         'agent_profiles_id',
       ]);
 
       // Find the invitation
@@ -1188,11 +1188,12 @@ protected function enrollByInvitationToken($input) {
       // Create the device
       $computer = new Computer();
       $computerId = $computer->add([
-         'name'         => $email,
-         'users_id'     => $userId,
-         'entities_id'  => $entityId,
-         'serial'       => $serial,
-         'uuid'         => $uuid,
+         'name'               => $email,
+         'users_id'           => $userId,
+         'entities_id'        => $entityId,
+         'serial'             => $serial,
+         'uuid'               => $uuid,
+         'computertypes_id'   => $computerTypeId,
       ]);
       if ($computerId === false) {
          $event = __("Cannot create the device", 'flyvemdm');

diff --git a/inc/package.class.php b/inc/package.class.php
@@ -121,7 +121,7 @@ public static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $
     * @param integer $ID ID of the item to show
     * @param array $options
     */
-   public function showForm($ID, $options=[]) {
+   public function showForm($ID, array $options = []) {
       $this->initForm($ID, $options);
       $this->showFormHeader($options);
 

diff --git a/tests/suite-integration/PluginFlyvemdmAgent.php b/tests/suite-integration/PluginFlyvemdmAgent.php
@@ -86,6 +86,10 @@ public function testDeviceCountLimit() {
     * @tags testEnrollAgent
     */
    public function testEnrollAgent() {
+      // Set a computer type
+      $computerTypeId = 3;
+      \Config::setConfigurationValues('flyvemdm', ['computertypes_id' => $computerTypeId]);
+
       list($user, $serial, $guestEmail, $invitation) = $this->createUserInvitation(\User::getForeignKeyField());
 
       $invitationToken = $invitation->getField('invitation_token');
@@ -183,6 +187,9 @@ public function testEnrollAgent() {
       $computer = new \Computer();
       $this->boolean($computer->getFromDB($agent->getField(\Computer::getForeignKeyField())))->isTrue();
 
+      // Test the computer has the expected type
+      $this->string($computer->getField('computertypes_id'))->isEqualTo($computerTypeId);
+
       // Test the serial is saved
       $this->string($computer->getField('serial'))->isEqualTo($serial);