Updated build number

GLPIAPI.py

@@ -12,9 +12,11 @@ class GLPIAPI:
         self.StatusCode = None
         self.Headers = None
         self.ActiveProfile = None
+        self.ActiveEntity = None
+        self.RecurseEntity = True
         self.InitConnection()
         if(Profile == None):
-            self.ActiveProfile = self.GetActiveProfile()
+            self.ActiveProfile = self.GetActiveProfile()[0]
         else:
             self.ActiveProfile = Profile
             profileId = self.GetItems('Profile', 'Profile.name', Profile)[1]['2']
@@ -39,9 +41,20 @@ class GLPIAPI:
                 "Session-Token": self.SessionToken,
                 "App-Token": self.AppToken
             }
-            if(self.GetActiveProfile() != self.ActiveProfile and self.ActiveProfile != None):
-                profileId = self.GetItems('Profile', 'Profile.name', self.ActiveProfile)[1]['2']
-                self.SetActiveProfile(profileId)
+            if(self.GetActiveProfile()[0] != self.ActiveProfile and self.ActiveProfile != None):
+                profile = [p for p in self.GetUserProfiles() if p["name"] == self.ActiveProfile]
+                if(profile != []):
+                    self.SetActiveProfile(profile[0]["id"])
+                else:
+                    raise Exception(f"{self.ActiveProfile} is not in user profiles")
+            
+            ActiveEntities = self.GetActiveEntity()
+            if((ActiveEntities[0] != self.ActiveEntity or ActiveEntities[1] != self.RecurseEntity) and self.ActiveEntity != None):
+                entity = [e for e in self.GetUserEntities() if e["id"] == self.ActiveEntity]
+                if(entity != []):
+                    self.SetActiveEntity(entity[0]["id"], self.RecurseEntity)
+                else:
+                    raise Exception(f"{self.ActiveEntity} is not in user entities")
         else:
             raise Exception(f"{result.status_code} - {result.json()[0]}")
             
@@ -50,14 +63,14 @@ class GLPIAPI:
         result = requests.get(sessionUri, headers=self.Headers)
         if(result.status_code != 200 and result.json()[0] == 'ERROR_SESSION_TOKEN_INVALID'):
             self.InitConnection()
-        return
+        return result.status_code
     
     def GetUserProfiles(self):
         self.CheckConnection()
         uri = f"{self.Server}/apirest.php/getMyProfiles"
         req = requests.get(uri, headers=self.Headers)
         if(req.status_code == 200):
-            return req.json()
+            return req.json()['myprofiles']
         else:
             return req.status_code
 
@@ -66,18 +79,66 @@ class GLPIAPI:
         uri = f"{self.Server}/apirest.php/getActiveProfile"
         req = requests.get(uri, headers=self.Headers)
         if(req.status_code == 200):
-            return req.json()['active_profile']['name']
+            return (req.json()['active_profile']['name'],req.json()['active_profile']['id'])
         else:
             return req.status_code
 
-    def SetActiveProfile(self, profileId):
+    def SetActiveProfile(self, profile):
         self.CheckConnection()
+        if(type(profile) == str):
+            profileFound = [p for p in self.GetUserProfiles() if p["name"] == profile]
+            if(profileFound != []):
+                profileId = profileFound[0]["id"]
+        else:
+            profileId = profile
         body = {
             "profiles_id" : profileId
         }
         
         uri = f"{self.Server}/apirest.php/changeActiveProfile"
-        return requests.post(uri, headers=self.Headers, json=body)
+        req = requests.post(uri, headers=self.Headers, json=body)
+        if(req.status_code == 200):
+            self.ActiveProfile = self.GetActiveProfile()[0]
+        return req.status_code
+        
+    def GetUserEntities(self):
+        self.CheckConnection()
+        uri = f"{self.Server}/apirest.php/getMyEntities"
+        req = requests.get(uri, headers=self.Headers)
+        if(req.status_code == 200):
+            return req.json()["myentities"]
+        else:
+            return req.status_code
+    
+    def GetActiveEntity(self):
+        self.CheckConnection()
+        uri = f"{self.Server}/apirest.php/getActiveEntities"
+        req = requests.get(uri, headers=self.Headers)
+        if(req.status_code == 200):
+            return (req.json()['active_entity']['id'], req.json()['active_entity']['active_entity_recursive'], req.json()['active_entity']['active_entities'])
+        else:
+            return req.status_code
+    
+    def SetActiveEntity(self, entity, recurse=True):
+        self.CheckConnection()
+        if(type(entity) == str):
+            entityFound = [e for e in self.GetUserEntities() if e["name"] == entity]
+            if(entityFound != []):
+                entityId = entityFound[0]["id"]
+        else:
+            entityId = entity
+        body = {
+            "entities_id" : entityId,
+            "is_recursive" : recurse
+        }
+        
+        uri = f"{self.Server}/apirest.php/changeActiveEntities"
+        req = requests.post(uri, headers=self.Headers, json=body)
+        if(req.status_code == 200):
+            ActiveEntities = self.GetActiveEntity()
+            self.ActiveEntity = ActiveEntities[0]
+            self.RecurseEntity = ActiveEntities[1]
+        return req.status_code
     
     def GetComputers(self, deviceName=None, serialNumber=None, user=None, imei=None, airwatchDevice=None, fieldsToDisplay=[], trashbin=0):
         '''
@@ -187,8 +248,8 @@ class GLPIAPI:
         searchUri += f"&forcedisplay[0]={idFieldNumber}"
 
         if(fieldsToDisplay != []):
-            for i in range(1, len(fieldsToDisplay+1)):
-                searchUri += f"&forcedisplay[{i}]={fieldsToDisplay[i]}"
+            for i in range(1, len(fieldsToDisplay)+1):
+                searchUri += f"&forcedisplay[{i}]={fieldsToDisplay[i-1]}"
                 
         search = requests.get(searchUri, headers=self.Headers)
         

build/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GLPIAPI"
-version = "1.0.5"
+version = "1.0.6"
 description = "A module python to make it easier to use GLPI API"
 readme = "README.md"
 dependencies = [