Merge branch 'main' into dev

This commit is contained in:
Jason SECULA
2025-09-12 12:06:23 +02:00
3 changed files with 25 additions and 3 deletions

View File

@ -83,6 +83,17 @@ class GLPIAPI:
uri = f"{self.Server}/apirest.php/Computer/" uri = f"{self.Server}/apirest.php/Computer/"
return requests.put(uri, headers=self.Headers, json=body) return requests.put(uri, headers=self.Headers, json=body)
def UpdateUser(self, deviceid, username):
body = {
"input" : {
"id" : deviceid,
"users_id" : username
}
}
uri = f"{self.Server}/apirest.php/Computer/"
return requests.put(uri, headers=self.Headers, json=body)
def CreateInventoryForAirwatchDevice(self, device, deviceName, apps=None): def CreateInventoryForAirwatchDevice(self, device, deviceName, apps=None):
platforms = { platforms = {
2:"Apple iOS", 2:"Apple iOS",

View File

@ -168,7 +168,10 @@ class AirwatchUser:
self.Group = user["Group"] self.Group = user["Group"]
self.GroupId = user["LocationGroupId"] self.GroupId = user["LocationGroupId"]
self.OrgUuid = user["OrganizationGroupUuid"] self.OrgUuid = user["OrganizationGroupUuid"]
self.DeviceCount = int(user["EnrolledDevicesCount"]) if(user["EnrolledDevicesCount"] != ''):
self.DeviceCount = int(user["EnrolledDevicesCount"])
else:
self.DeviceCount = 0
class AirwatchDevice: class AirwatchDevice:
@ -182,8 +185,12 @@ class AirwatchDevice:
self.GroupId = device["LocationGroupId"]["Id"]["Value"] self.GroupId = device["LocationGroupId"]["Id"]["Value"]
self.Group = device["LocationGroupName"] self.Group = device["LocationGroupName"]
self.GroupUuid = device["LocationGroupId"]["Uuid"] self.GroupUuid = device["LocationGroupId"]["Uuid"]
self.UserId = device["UserId"]["Id"]["Value"] if(device["UserId"].get("Id") != None):
self.User = device["UserName"] self.UserId = device["UserId"]["Id"]["Value"]
self.User = device["UserName"]
else:
self.UserId = None
self.User = None
self.UserEmail = device["UserEmailAddress"] self.UserEmail = device["UserEmailAddress"]
self.PlatformId = device["PlatformId"]["Id"]["Value"] self.PlatformId = device["PlatformId"]["Id"]["Value"]
self.Platform = device["Platform"] self.Platform = device["Platform"]

View File

@ -230,6 +230,10 @@ for device in devices:
logger.info(f"Updating {deviceID} on GLPI") logger.info(f"Updating {deviceID} on GLPI")
glpiapi.UpdateInventory(inventory.Json()) glpiapi.UpdateInventory(inventory.Json())
#if(data['70'] == None and device.User != settings["AIRWATCH"]["StagingUser"]):
#logger.info(f"Updating user from {data['70']} to {device.User} in GLPI (id={deviceID})")
#glpiapi.UpdateUser(deviceID, device.User)
if(data['5'] != device.SerialNumber): if(data['5'] != device.SerialNumber):
logger.info(f"Updating serial number from {data['5']} to {device.SerialNumber} in GLPI (id={deviceID})") logger.info(f"Updating serial number from {data['5']} to {device.SerialNumber} in GLPI (id={deviceID})")
glpiapi.UpdateSerialNumber(deviceID, device.SerialNumber) glpiapi.UpdateSerialNumber(deviceID, device.SerialNumber)