deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Improve user info response with license batching

Browse Source
This commit is contained in:
Jay Lee
2016-12-27 10:57:18 -05:00
parent 9135e15b12
commit 07f1bc050a
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gam.py
View File

@@ -7684,8 +7684,12 @@ def doGetUserInfo(user_email=None):
getSchemas = getAliases = getGroups = getLicenses = True getSchemas = getAliases = getGroups = getLicenses = True
projection = u'full' projection = u'full'
customFieldMask = viewType = None customFieldMask = viewType = None
skus = [u'Google-Apps-For-Business', u'Google-Apps-Unlimited', u'Google-Apps-For-Government', u'Google-Apps-For-Postini', skus = [u'Google-Apps-For-Business', u'Google-Apps-For-Government', u'Google-Apps-For-Postini',
u'Google-Apps-Lite', u'Google-Vault', u'Google-Vault-Former-Employee'] u'Google-Apps-Lite', u'Google-Apps-Unlimited', u'Google-Drive-storage-20GB',
u'Google-Drive-storage-50GB', u'Google-Drive-storage-200GB', u'Google-Drive-storage-400GB',
u'Google-Drive-storage-1TB', u'Google-Drive-storage-2TB', u'Google-Drive-storage-4TB',
u'Google-Drive-storage-8TB', u'Google-Drive-storage-16TB', u'Google-Vault',
u'Google-Vault-Former-Employee',]
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower() myarg = sys.argv[i].lower()
if myarg == u'noaliases': if myarg == u'noaliases':
@@ -7880,13 +7884,20 @@ def doGetUserInfo(user_email=None):
if getLicenses: if getLicenses:
print u'Licenses:' print u'Licenses:'
lic = buildGAPIObject(u'licensing') lic = buildGAPIObject(u'licensing')
lbatch = googleapiclient.http.BatchHttpRequest()
global user_licenses
user_licenses = []
for sku in skus: for sku in skus:
productId, skuId = getProductAndSKU(sku) productId, skuId = getProductAndSKU(sku)
try: lbatch.add(lic.licenseAssignments().get(userId=user_email, productId=productId, skuId=skuId), callback=user_lic_result)
result = callGAPI(lic.licenseAssignments(), u'get', throw_reasons=[u'notFound', u'invalid', u'forbidden'], userId=user_email, productId=productId, skuId=skuId) lbatch.execute()
except googleapiclient.errors.HttpError: for user_license in user_licenses:
continue print ' %s' % user_license
print u' %s' % result[u'skuId']
def user_lic_result(request_id, response, exception):
if response and u'skuId' in response:
global user_licenses
user_licenses.append(response[u'skuId'])
def doGetGroupInfo(group_name=None): def doGetGroupInfo(group_name=None):
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')