From d1e87df2df477137b52b6c64b1840f392d6db85b Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 14 Feb 2024 08:34:39 -0800 Subject: [PATCH] Updated `gam info user ... locations formatjson` to include the `buildingName` field in the `locations` entries. --- docs/GamUpdates.md | 6 ++++++ docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Send-Email.md | 8 ++++---- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 14 ++++++++++---- src/gam/__init__.py | 5 +++++ 6 files changed, 33 insertions(+), 16 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index a18afc1b..a8f5df76 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,12 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.68.07 + +Updated `gam info user ... locations formatjson` to include the `buildingName` field in the +`locations` entries. If `gam.cfg` contains `quick_info_user = true` or the `quick` option +is included on the command line, add the option `buildingnames` to the command line. + ### 6.68.06 Fixed bug in `gam copy drivefile ... mergewithparent` that incorrectly named diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index 17c25b6d..b394b6ce 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1002,7 +1002,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Send-Email.md b/docs/Send-Email.md index d0f1df49..f5c785b1 100644 --- a/docs/Send-Email.md +++ b/docs/Send-Email.md @@ -241,7 +241,7 @@ Your HTML message will contain lines like this: ``` -Your command line will have: `embedimage file1.jpg image1` embedimage file2.jpg image2` +Your command line will have: `embedimage file1.jpg image1 embedimage file2.jpg image2` ## Send an email from a user sendas You want to send an email from a user's sendas address. @@ -312,7 +312,7 @@ Your HTML message will contain lines like this: ``` -Your command line will have: `embedimage file1.jpg image1` embedimage file2.jpg image2` +Your command line will have: `embedimage file1.jpg image1 embedimage file2.jpg image2` ### Examples Send an email to a user's personal address notifying them of their new Google Workspace account; @@ -376,7 +376,7 @@ Your HTML message will contain lines like this: ``` -Your command line will have: `embedimage file1.jpg image1` embedimage file2.jpg image2` +Your command line will have: `embedimage file1.jpg image1 embedimage file2.jpg image2` ## Send an email to users ``` @@ -418,7 +418,7 @@ Your HTML message will contain lines like this: ``` -Your command line will have: `embedimage file1.jpg image1` embedimage file2.jpg image2` +Your command line will have: `embedimage file1.jpg image1 embedimage file2.jpg image2` ## Example Send a message to a user, save the Message-ID so that a later reminder message can be sent diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 5fc4226f..3cef3854 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAMADV-XTD3 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAMADV-XTD3 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.68.06 + Latest: 6.68.07 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.68.06 +6.68.07 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.68.07 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.2 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 31dbf75a..c41b195a 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,13 @@ +7.00.00 + +Merged GAM-Team version + +6.68.07 + +Updated `gam info user ... locations formatjson` to include the `buildingName` field in the +`locations` entries. If `gam.cfg` contains `quick_info_user = true` or the `quick` option +is included on the command line, add the option `buildingnames` to the command line. + 6.68.06 Fixed bug in `gam copy drivefile ... mergewithparent` that incorrectly named @@ -5,10 +15,6 @@ the copied file with the name of the parent folder. Updated `gam copy|move drivefile` to avoid copying/moving the same file twice. -7.00.00 - -Merged GAM-Team version - 6.68.05 Updated `gam print groups ... ciallfields|(cifields )` to account for an diff --git a/src/gam/__init__.py b/src/gam/__init__.py index ebdd99bb..7f591348 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -41128,6 +41128,8 @@ def getUserAttributes(cd, updateCmd, noUid=False): body['name'].pop('fullName') if 'sshPublicKeys' in body and 'fingerprint' in body['sshPublicKeys']: body['sshPublicKeys'].pop('fingerprint') + for location in body.get('locations', []): + location.pop('buildingName', None) elif myarg == 'employeeid': entry = {'type': 'organization', 'value': getString(Cmd.OB_STRING, minLen=0)} appendItemToBodyList(body, 'externalIds', entry, 'value') @@ -42324,6 +42326,9 @@ def infoUsers(entityList): addJsonGroupParents(groupParents, group, groupEmail) if getLicenses: user['licenses'] = [SKU.formatSKUIdDisplayName(u_license) for u_license in licenses] + if getBuildingNames: + for location in user.get('locations', []): + location['buildingName'] = _getBuildingNameById(cd, location.get('buildingId', '')) if not getAliases: user.pop('aliases', None) user.pop('nonEditableAliases', None)