From 38b424b62e5260c825f8e100f38f8c7bffbc8c7c Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Wed, 21 Apr 2021 06:38:07 -0700
Subject: [PATCH] Add convertalias to delegate commands to convert aliases to
 primary (#1368)

* Add convertalias to delegate commands to convert aliases to primary

* New PyInstaller, won't build ARM without it
---
 .github/workflows/build.yml |  2 +-
 src/GamCommands.txt         |  6 +++---
 src/gam/__init__.py         | 17 ++++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 055603ff..1752074a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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:
diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 376a4717..a66a03a6 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -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]
 
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index fac16687..865e69c3 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -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: