gam7 7.7.0__py3-none-any.whl → 7.7.1__py3-none-any.whl

gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.07.00'
+__version__ = '7.07.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -28183,75 +28183,171 @@ def doDeleteChromePolicy():
   except (GAPI.notFound, GAPI.permissionDenied, GAPI.invalidArgument, GAPI.serviceNotAvailable, GAPI.quotaExceeded) as e:
     entityActionFailedWarning(kvList, str(e))
 
-CHROME_SCHEMA_TYPE_MESSAGE = {
-  'chrome.users.AutoUpdateCheckPeriodNew':
-    {'autoupdatecheckperiodminutesnew':
-       {'casedField': 'autoUpdateCheckPeriodMinutesNew',
-        'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
+CHROME_SCHEMA_SPECIAL_CASES = {
   'chrome.users.AutoUpdateCheckPeriodNewV2':
     {'autoupdatecheckperiodminutesnew':
        {'casedField': 'autoUpdateCheckPeriodMinutesNew',
-        'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
-  'chrome.users.BrowserSwitcherDelayDuration':
+        'type': 'duration', 'minVal': 1, 'maxVal': 720}},
+  'chrome.users.Avatar':
+    {'useravatarimage':
+       {'casedField': 'userAvatarImage',
+        'type': 'downloadUri'}},
+  'chrome.users.BrowserSwitcherDelayDurationV2':
     {'browserswitcherdelayduration':
        {'casedField': 'browserSwitcherDelayDuration',
-        'type': 'duration', 'minVal': 0, 'maxVal': 30, 'scale': 1}},
+        'type': 'duration', 'minVal': 0, 'maxVal': 30}},
+  'chrome.users.BrowsingDataLifetimeV2':
+    {'browsinghistoryttl':
+       {'casedField': 'browsingHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'downloadhistoryttl':
+       {'casedField': 'downloadHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cookiesandothersitedatattl':
+       {'casedField': 'cookiesAndOtherSiteDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cachedimagesandfilesttl':
+       {'casedField': 'cachedImagesAndFilesTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'passwordsigninttl':
+       {'casedField': 'passwordSigninTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'autofillttl':
+       {'casedField': 'autofillTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'sitesettingsttl':
+       {'casedField': 'siteSettingsTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'hostedappdatattl':
+       {'casedField': 'hostedAppDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None}},
   'chrome.users.CloudReportingUploadFrequencyV2':
     {'cloudreportinguploadfrequency':
        {'casedField': 'cloudReportingUploadFrequency',
-        'type': 'count', 'minVal': 3, 'maxVal': 24, 'scale': 1}},
-  'chrome.users.FetchKeepaliveDurationSecondsOnShutdown':
+        'type': 'duration', 'minVal': 3, 'maxVal': 24}},
+  'chrome.users.FetchKeepaliveDurationSecondsOnShutdownV2':
     {'fetchkeepalivedurationsecondsonshutdown':
        {'casedField': 'fetchKeepaliveDurationSecondsOnShutdown',
-        'type': 'duration', 'minVal': 0, 'maxVal': 5, 'scale': 1}},
-  'chrome.users.MaxInvalidationFetchDelay':
+        'type': 'duration', 'minVal': 0, 'maxVal': 5}},
+  'chrome.users.MaxInvalidationFetchDelayV2':
     {'maxinvalidationfetchdelay':
        {'casedField': 'maxInvalidationFetchDelay',
-        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'scale': 1, 'default': 10}},
+        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
   'chrome.users.PrintingMaxSheetsAllowed':
     {'printingmaxsheetsallowednullable':
        {'casedField': 'printingMaxSheetsAllowedNullable',
-        'type': 'value', 'minVal': 1, 'maxVal': None, 'scale': 1}},
-  'chrome.users.PrintJobHistoryExpirationPeriodNew':
+        'type': 'value', 'minVal': 1, 'maxVal': None}},
+  'chrome.users.PrintJobHistoryExpirationPeriodNewV2':
     {'printjobhistoryexpirationperioddaysnew':
        {'casedField': 'printJobHistoryExpirationPeriodDaysNew',
-        'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 86400}},
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
   'chrome.users.RelaunchNotificationWithDurationV2':
     {'relaunchnotificationperiodduration':
        {'casedField': 'relaunchNotificationPeriodDuration',
-        'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 3600}},
-  'chrome.users.SecurityTokenSessionSettings':
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
+  'chrome.users.SecurityTokenSessionSettingsV2':
     {'securitytokensessionnotificationseconds':
        {'casedField': 'securityTokenSessionNotificationSeconds',
-        'type': 'duration', 'minVal': 0, 'maxVal': 9999, 'scale': 1}},
-  'chrome.users.SessionLength':
+        'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
+  'chrome.users.SessionLengthV2':
     {'sessiondurationlimit':
        {'casedField': 'sessionDurationLimit',
-        'type': 'duration', 'minVal': 1, 'maxVal': 1440, 'scale': 60}},
+        'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
   'chrome.users.UpdatesSuppressed':
     {'updatessuppresseddurationmin':
        {'casedField': 'updatesSuppressedDurationMin',
-        'type': 'count', 'minVal': 1, 'maxVal': 1440, 'scale': 1},
+        'type': 'count', 'minVal': 1, 'maxVal': 1440},
      'updatessuppressedstarttime':
        {'casedField': 'updatesSuppressedStartTime',
         'type': 'timeOfDay'}},
-  'chrome.devices.managedguest.Avatar':
-    {'useravatarimage':
-       {'casedField': 'userAvatarImage',
-        'type': 'downloadUri'}},
-  'chrome.devices.managedguest.Wallpaper':
+  'chrome.users.Wallpaper':
     {'wallpaperimage':
        {'casedField': 'wallpaperImage',
         'type': 'downloadUri'}},
+  'chrome.devices.EnableReportUploadFrequencyV2':
+    {'reportdeviceuploadfrequency':
+       {'casedField': 'reportDeviceUploadFrequency',
+        'type': 'duration', 'minVal': 60, 'maxVal': 25379}},
+  'chrome.devices.ScheduledRebootDurationV2':
+    {'uptimelimitduration':
+       {'casedField': 'uptimeLimitDuration',
+        'type': 'duration', 'minVal': 1, 'maxVal': 365}},
   'chrome.devices.SignInWallpaperImage':
     {'devicewallpaperimage':
        {'casedField': 'deviceWallpaperImage',
         'type': 'downloadUri'}},
-  'chrome.users.Avatar':
+  'chrome.devices.kiosk.AcPowerSettingsV2':
+    {'acidletimeout':
+       {'casedField': 'acIdleTimeout',
+        'type': 'duration', 'minVal': 1, 'maxVal': 35000},
+     'acwarningtimeout':
+       {'casedField': 'acWarningTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'acdimtimeout':
+       {'casedField': 'acDimTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'acscreenofftimeout':
+       {'casedField': 'acScreenOffTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
+  'chrome.devices.kiosk.BatteryPowerSettingsV2':
+    {'batteryidletimeout':
+       {'casedField': 'batteryIdleTimeout',
+        'type': 'duration', 'minVal': 1, 'maxVal': 35000},
+     'batterywarningtimeout':
+       {'casedField': 'batteryWarningTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'batterydimtimeout':
+       {'casedField': 'batteryDimTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000},
+     'batteryscreenofftimeout':
+       {'casedField': 'batteryScreenOffTimeout',
+        'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
+  'chrome.devices.managedguest.Avatar':
     {'useravatarimage':
        {'casedField': 'userAvatarImage',
         'type': 'downloadUri'}},
-  'chrome.users.Wallpaper':
+  'chrome.devices.managedguest.BrowsingDataLifetimeV2':
+    {'browsinghistoryttl':
+       {'casedField': 'browsingHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'downloadhistoryttl':
+       {'casedField': 'downloadHistoryTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cookiesandothersitedatattl':
+       {'casedField': 'cookiesAndOtherSiteDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'cachedimagesandfilesttl':
+       {'casedField': 'cachedImagesAndFilesTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'passwordsigninttl':
+       {'casedField': 'passwordSigninTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'autofillttl':
+       {'casedField': 'autofillTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'sitesettingsttl':
+       {'casedField': 'siteSettingsTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None},
+     'hostedappdatattl':
+       {'casedField': 'hostedAppDataTtl',
+        'type': 'duration', 'minVal': 1, 'maxVal': None}},
+  'chrome.devices.managedguest.MaxInvalidationFetchDelayV2':
+    {'maxinvalidationfetchdelay':
+       {'casedField': 'maxInvalidationFetchDelay',
+        'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
+  'chrome.devices.managedguest.PrintJobHistoryExpirationPeriodNewV2':
+    {'printjobhistoryexpirationperioddaysnew':
+       {'casedField': 'printJobHistoryExpirationPeriodDaysNew',
+        'type': 'duration', 'minVal': -1, 'maxVal': None}},
+  'chrome.devices.managedguest.SecurityTokenSessionSettingsV2':
+    {'securitytokensessionnotificationseconds':
+       {'casedField': 'securityTokenSessionNotificationSeconds',
+        'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
+  'chrome.devices.managedguest.SessionLengthV2':
+    {'sessiondurationlimit':
+       {'casedField': 'sessionDurationLimit',
+        'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
+  'chrome.devices.managedguest.Wallpaper':
     {'wallpaperimage':
        {'casedField': 'wallpaperImage',
         'type': 'downloadUri'}},
@@ -28266,9 +28362,7 @@ CHROME_TARGET_VERSION_PATTERN = re.compile(r'^(\d{1,4}\.){1,4}$')
 #	[(printerid <PrinterID>)|(appid <AppID>)]
 def doUpdateChromePolicy():
   def getSpecialVtypeValue(vtype, value):
-    if vtype == 'duration':
-      return {vtype: f'{value}s'}
-    if vtype in {'value', 'downloadUri'}:
+    if vtype in {'duration', 'value', 'downloadUri'}:
       return {vtype: value}
     if vtype == 'count':
       return value
@@ -28326,8 +28420,8 @@ def doUpdateChromePolicy():
           for field in jsonData.get('fields', []):
             casedField = field['name']
             lowerField = casedField.lower()
-            # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-            tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(lowerField)
+            # Handle fields with durations, values, counts and timeOfDay as special cases
+            tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(lowerField)
             if tmschema:
               body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(tmschema['type'], field['value'])
               body['requests'][-1]['updateMask'] += f'{casedField},'
@@ -28363,8 +28457,8 @@ def doUpdateChromePolicy():
             body['requests'][-1]['policyValue']['value'][casedField] = value
             body['requests'][-1]['updateMask'] += f'{casedField},'
           break
-        # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-        tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(field)
+        # Handle fields with durations, values, counts and timeOfDay as special cases
+        tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(field)
         if tmschema:
           casedField = tmschema['casedField']
           vtype = tmschema['type']
@@ -28372,9 +28466,9 @@ def doUpdateChromePolicy():
             value = getString(Cmd.OB_STRING)
           elif vtype != 'timeOfDay':
             if 'default' not in tmschema:
-              value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])*tmschema['scale']
+              value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])
             else:
-              value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])*tmschema['scale']
+              value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])
           else:
             value = getHHMM()
           body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(vtype, value)
@@ -28507,20 +28601,14 @@ def doPrintShowChromePolicies():
                 'chrome.users.apps.ManagedConfiguration'} and 'managedConfiguration' in values:
       values['managedConfiguration'] = json.dumps(values['managedConfiguration'], ensure_ascii=False).replace('\\n', '').replace('\\"', '"')[1:-1]
     for setting, value in values.items():
-      # Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
-      schema = CHROME_SCHEMA_TYPE_MESSAGE.get(name, {}).get(setting.lower())
+      # Handle fields with durations, values, counts and timeOfDay as special cases
+      schema = CHROME_SCHEMA_SPECIAL_CASES.get(name, {}).get(setting.lower())
       if schema and setting == schema['casedField']:
         vtype = schema['type']
-        if vtype in {'duration', 'value'}:
+        if vtype in {'duration', 'value', 'downloadUri'}:
           value = value.get(vtype, '')
-          if value:
-            if value.endswith('s'):
-              value = value[:-1]
-            value = int(value) // schema['scale']
         elif vtype == 'count':
           pass
-        elif vtype == 'downloadUri':
-          value = value.get(vtype, '')
         else: #timeOfDay
           hours = value.get(vtype, {}).get('hours', 0)
           minutes = value.get(vtype, {}).get('minutes', 0)

{gam7-7.7.0.dist-info → gam7-7.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.7.0
+Version: 7.7.1
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.7.0.dist-info → gam7-7.7.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=WZoLfil7JdhIYFdy5VijYGf0x_mUzURBAWAwqLkLgkc,3494807
+gam/__init__.py,sha256=ZrcsSOvwCZR3oAYBrH2ei3gtfbJ7RKvu49OUNN-1TaA,3498690
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=nJuWha0xm5dHw_5ptGphwRoO-r36Ccpqiww9pCEDbSc,67484
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
 gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
 gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
 gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
-gam7-7.7.0.dist-info/METADATA,sha256=jeufu2vV_fW7CSQMkK0iLMjSk3gk1xvYzwZd6IM2Im8,2969
-gam7-7.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.7.0.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.7.0.dist-info/RECORD,,
+gam7-7.7.1.dist-info/METADATA,sha256=XFgikxYfyOd56QEPd77XMra_-N0HfZnASQXsi1fIhmU,2969
+gam7-7.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.7.1.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.7.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.7.1.dist-info/RECORD,,