Merge branch 'master' of https://github.com/jay0lee/GAM

src/gam/__init__.py

@@ -3835,6 +3835,7 @@ DRIVEFILE_ACL_ROLES_MAP = {
 def addDriveFileACL(users):
     fileId = sys.argv[5]
     body = {'type': sys.argv[6].lower()}
+    ubody = {}
     sendNotificationEmail = False
     emailMessage = None
     transferOwnership = None
@@ -3868,6 +3869,7 @@ def addDriveFileACL(users):
             if body['role'] == 'owner':
                 sendNotificationEmail = True
                 transferOwnership = True
+            ubody['role'] = body['role']
             i += 2
         elif myarg == 'sendemail':
             sendNotificationEmail = True
@@ -3877,7 +3879,7 @@ def addDriveFileACL(users):
             emailMessage = sys.argv[i + 1]
             i += 2
         elif myarg == 'expires':
-            body['expirationTime'] = utils.get_time_or_delta_from_now(
+            ubody['expirationTime'] = utils.get_time_or_delta_from_now(
                 sys.argv[i + 1])
             i += 2
         elif myarg == 'asadmin':
@@ -3900,6 +3902,17 @@ def addDriveFileACL(users):
                            supportsAllDrives=True,
                            transferOwnership=transferOwnership,
                            useDomainAdminAccess=useDomainAdminAccess)
+        if 'expirationTime' in ubody:
+            result = gapi.call(drive.permissions(),
+                               'update',
+                               fields='*',
+                               fileId=fileId,
+                               permissionId=result['id'],
+                               removeExpiration=False,
+                               transferOwnership=False,
+                               body=ubody,
+                               supportsAllDrives=True,
+                               useDomainAdminAccess=useDomainAdminAccess)
         printPermission(result)