deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 14:13:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Add convertalias to delegate commands to convert aliases to primary (#1368)

Browse Source 
* Add convertalias to delegate commands to convert aliases to primary

* New PyInstaller, won't build ARM without it
This commit is contained in:
Ross Scroggs
2021-04-21 06:38:07 -07:00
committed by GitHub
parent 1d9bf0b1aa
commit 38b424b62e
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -18,7 +18,7 @@ env:
MIN_OPENSSL_VERSION: "1.1.1i"
PATCHELF_VERSION: "0.12"
# PYINSTALLER_VERSION can be full commit hash or version like v4.20
PYINSTALLER_VERSION: "227eac14955c02db21d4702429896d4b74beed5e"
PYINSTALLER_VERSION: "e20e74c03768d432d48665b8ef1e02511b16e4be"
jobs:
build:

6
src/GamCommands.txt
View File

@ -1623,9 +1623,9 @@ gam <UserTypeEntity> sendemail [recipient|to <EmailAddress>] [from <EmailAddress
[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
(header <String> <String>)*
gam <UserTypeEntity> create|add delegate|delegates <EmailAddress>
gam <UserTypeEntity> delegate|delegates to <EmailAddress>
gam <UserTypeEntity> delete|del delegate|delegates <EmailAddress>
gam <UserTypeEntity> create|add delegate|delegates [convertalias] <EmailAddress>
gam <UserTypeEntity> delegate|delegates to [convertalias] <EmailAddress>
gam <UserTypeEntity> delete|del delegate|delegates [convertalias] <EmailAddress>
gam <UserTypeEntity> show delegates|delegate [csv]
gam <UserTypeEntity> print delegates [todrive]

17
src/gam/__init__.py
View File

@ -1415,13 +1415,17 @@ def addDelegates(users, i):
if sys.argv[i].lower() != 'to':
controlflow.missing_argument_exit('to', 'gam <users> delegate')
i += 1
convertAlias = False
if sys.argv[i].lower().replace('_', '') == 'convertalias':
convertAlias = True
i += 1
delegate = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
delegate = gapi_directory_users.get_primary(delegate)
if convertAlias:
delegate = gapi_directory_users.get_primary(delegate)
i = 0
count = len(users)
for delegator in users:
i += 1
delegator = gapi_directory_users.get_primary(delegator)
delegator, gmail = buildGmailGAPIObject(delegator)
if not gmail:
continue
@ -1496,7 +1500,14 @@ def printShowDelegates(users, csvFormat):
def deleteDelegate(users):
delegate = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
convertAlias = False
i = 5
if sys.argv[i].lower().replace('_', '') == 'convertalias':
convertAlias = True
i += 1
delegate = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
if convertAlias:
delegate = gapi_directory_users.get_primary(delegate)
i = 0
count = len(users)
for user in users: