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

Updated gam info user ... locations formatjson to include the buildingName field in the locations entries.

Browse Source
This commit is contained in:
Ross Scroggs
2024-02-14 08:34:39 -08:00
parent 70640c1ddb
commit d1e87df2df
6 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/GamUpdates.md
View File

@@ -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 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 ### 6.68.06
Fixed bug in `gam <UserTypeEntity> copy drivefile <DriveFileID> ... mergewithparent` that incorrectly named Fixed bug in `gam <UserTypeEntity> copy drivefile <DriveFileID> ... mergewithparent` that incorrectly named

4
docs/How-to-Upgrade-from-Standard-GAM.md
View File

@@ -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$ rm -f /Users/admin/GAMConfig/oauth2.txt
admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version 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 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 <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
MacOS Sonoma 14.2.1 x86_64 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>del C:\GAMConfig\oauth2.txt
C:\GAMADV-XTD3>gam version C:\GAMADV-XTD3>gam version
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found 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 <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
Windows-10-10.0.17134 AMD64 Windows-10-10.0.17134 AMD64

8
docs/Send-Email.md
View File

@@ -241,7 +241,7 @@ Your HTML message will contain lines like this:
<img src="cid:image2"/> <img src="cid:image2"/>
``` ```
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 ## Send an email from a user sendas
You want to send an email from a user's sendas address. You want to send an email from a user's sendas address.
@@ -312,7 +312,7 @@ Your HTML message will contain lines like this:
<img src="cid:image2"/> <img src="cid:image2"/>
``` ```
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 ### Examples
Send an email to a user's personal address notifying them of their new Google Workspace account; 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:
<img src="cid:image2"/> <img src="cid:image2"/>
``` ```
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 ## Send an email to users
``` ```
@@ -418,7 +418,7 @@ Your HTML message will contain lines like this:
<img src="cid:image2"/> <img src="cid:image2"/>
``` ```
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 ## Example
Send a message to a user, save the Message-ID so that a later reminder message can be sent Send a message to a user, save the Message-ID so that a later reminder message can be sent

12
docs/Version-and-Help.md
View File

@@ -3,7 +3,7 @@
Print the current version of Gam with details Print the current version of Gam with details
``` ```
gam version 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 <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
MacOS Sonoma 14.2.1 x86_64 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 Print the current version of Gam with details and time offset information
``` ```
gam version timeoffset 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 <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
MacOS Sonoma 14.2.1 x86_64 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 Print the current version of Gam with extended details and SSL information
``` ```
gam version extended 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 <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
MacOS Sonoma 14.2.1 x86_64 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 Path: /Users/Admin/bin/gamadv-xtd3
Version Check: Version Check:
Current: 5.35.08 Current: 5.35.08
Latest: 6.68.06 Latest: 6.68.07
echo $? echo $?
1 1
``` ```
@@ -72,7 +72,7 @@ echo $?
Print the current version number without details Print the current version number without details
``` ```
gam version simple gam version simple
6.68.06 6.68.07
``` ```
In Linux/MacOS you can do: In Linux/MacOS you can do:
``` ```
@@ -82,7 +82,7 @@ echo $VER
Print the current version of Gam and address of this Wiki Print the current version of Gam and address of this Wiki
``` ```
gam help gam help
GAM 6.68.06 - https://github.com/taers232c/GAMADV-XTD3 GAM 6.68.07 - https://github.com/taers232c/GAMADV-XTD3
Ross Scroggs <ross.scroggs@gmail.com> Ross Scroggs <ross.scroggs@gmail.com>
Python 3.12.2 64-bit final Python 3.12.2 64-bit final
MacOS Sonoma 14.2.1 x86_64 MacOS Sonoma 14.2.1 x86_64

14
src/GamUpdate.txt
View File

@@ -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 6.68.06
Fixed bug in `gam <UserTypeEntity> copy drivefile <DriveFileID> ... mergewithparent` that incorrectly named Fixed bug in `gam <UserTypeEntity> copy drivefile <DriveFileID> ... mergewithparent` that incorrectly named
@@ -5,10 +15,6 @@ the copied file with the name of the parent folder.
Updated `gam <UserTypeEntity> copy|move drivefile` to avoid copying/moving the same file twice. Updated `gam <UserTypeEntity> copy|move drivefile` to avoid copying/moving the same file twice.
7.00.00
Merged GAM-Team version
6.68.05 6.68.05
Updated `gam print groups ... ciallfields|(cifields <CIGroupFieldNameList>)` to account for an Updated `gam print groups ... ciallfields|(cifields <CIGroupFieldNameList>)` to account for an

5
src/gam/__init__.py
View File

@@ -41128,6 +41128,8 @@ def getUserAttributes(cd, updateCmd, noUid=False):
body['name'].pop('fullName') body['name'].pop('fullName')
if 'sshPublicKeys' in body and 'fingerprint' in body['sshPublicKeys']: if 'sshPublicKeys' in body and 'fingerprint' in body['sshPublicKeys']:
body['sshPublicKeys'].pop('fingerprint') body['sshPublicKeys'].pop('fingerprint')
for location in body.get('locations', []):
location.pop('buildingName', None)
elif myarg == 'employeeid': elif myarg == 'employeeid':
entry = {'type': 'organization', 'value': getString(Cmd.OB_STRING, minLen=0)} entry = {'type': 'organization', 'value': getString(Cmd.OB_STRING, minLen=0)}
appendItemToBodyList(body, 'externalIds', entry, 'value') appendItemToBodyList(body, 'externalIds', entry, 'value')
@@ -42324,6 +42326,9 @@ def infoUsers(entityList):
addJsonGroupParents(groupParents, group, groupEmail) addJsonGroupParents(groupParents, group, groupEmail)
if getLicenses: if getLicenses:
user['licenses'] = [SKU.formatSKUIdDisplayName(u_license) for u_license in licenses] 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: if not getAliases:
user.pop('aliases', None) user.pop('aliases', None)
user.pop('nonEditableAliases', None) user.pop('nonEditableAliases', None)