deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix device user printing

Browse Source
This commit is contained in:
Jay Lee
2022-06-30 14:48:44 +00:00
parent ecda9fe232
commit 939a1afbbf
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gam/gapi/cloudidentity/devices.py
View File

@@ -375,6 +375,7 @@ def print_():
pageToken = None pageToken = None
newest_deviceuser_date = '' newest_deviceuser_date = ''
total_items = 0 total_items = 0
device_users = {}
if not custom_device_filter: if not custom_device_filter:
device_filter = None device_filter = None
while True: while True:
@@ -405,18 +406,18 @@ def print_():
dev_date = dev_date.split('.')[0] dev_date = dev_date.split('.')[0]
if dev_date > newest_deviceuser_date: if dev_date > newest_deviceuser_date:
newest_deviceuser_date = dev_date newest_deviceuser_date = dev_date
device_id = device_user['name'].split('/')[1] deviceuser_name = device_user['name']
device_name = f'devices/{device_id}' device_users[deviceuser_name] = device_user
if 'users' not in devices[device_name]:
devices[device_name]['users'] = {}
devices[device_name]['users'][device_id] = device_user
pageToken = a_page.get('nextPageToken') pageToken = a_page.get('nextPageToken')
if not pageToken: if not pageToken:
break break
sys.stderr.write(page_message.replace('%%total_items%%', str(total_items))) sys.stderr.write(page_message.replace('%%total_items%%', str(total_items)))
for device in devices: for deviceuser_name, device_user in device_users.items():
if 'user' in device: device_id = deviceuser_name.split('/')[1]
device['users'] = list(device['user'].values()) device_name = f'devices/{device_id}'
if 'users' not in devices[device_name]:
devices[device_name]['users'] = []
devices[device_name]['users'].append(device_user)
for device in devices.values(): for device in devices.values():
device = utils.flatten_json(device) device = utils.flatten_json(device)
for a_key in device: for a_key in device: