Update create/update group, use update semantics (#501 )

On create group, use Group Settings to set description with new lines (#500 )
Update README.md
2026-06-04 06:11:39 +00:00 · 2017-05-22 19:43:58 -04:00 · 2017-05-20 17:33:57 -04:00 · 2017-05-20 16:14:59 -04:00 · 2017-05-20 15:34:25 -04:00 · 2017-05-20 12:47:13 -04:00
17 changed files with 2114 additions and 841 deletions
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ The GAM documentation is hosted in the [GitHub Wiki]
 # Mailing List / Discussion group
 The GAM mailing list / discussion group is hosted on [Google Groups].  You can join the list and interact via email, or just post from the web itself.
 # Author
-GAM is maintained by <a href="mailto:jay0lee@gmail.com">Jay Lee</a>. Please direct "how do I?" questions to the mailing list.
+GAM is maintained by <a href="mailto:jay0lee@gmail.com">Jay Lee</a>. Please direct "how do I?" questions to [Google Groups].

 [GAM release]: https://git.io/gamreleases
 [GitHub Releases]: https://github.com/jay0lee/GAM/releases
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1,6 +1,8 @@
 This document describes the GAM command line syntax in  modified BNF, see https://en.wikipedia.org/wiki/Backus-Naur_Form
+Skip the History section and start reading at Introduction.
+
 Items on the command line are space separated, when an actual space character is required, it will be indicated by <Space>.
-If an item contains spaces, it should be surrounded by " or '.
+If an item contains spaces, it should be surrounded by ".

 [] optional item
 () group items
@@ -13,21 +15,36 @@ Primitives
 <Number> ::= <Digit>+
 <Hex> ::= <Digit>|a|b|c|d|e|f|A|B|C|D|E|F
 <Space> ::= an actual space character
-<String> ::= a string of characters, surrounded by " or ' if it contains spaces
+<String> ::= a string of characters, surrounded by " if it contains spaces
 <TrueValues> ::= true|on|yes|enabled|1
 <FalseValues>= false|off|no|disabled|0
 <DataTransferService> ::= googledrive|gdrive|drive|"drive and docs"
-<ProductID> ::= Google-Apps|Google-Drive-storage|Google-Vault|Google-Coordinate
-<SKUID> ::= gafb|gafw|basic|gsuite-basic|
-	    gafg|gsuite-government|
-	    gal|lite|gsuite-lite|
-	    gams|postini|gsuite-gams|
-	    gau|unlimited|gsuite-business|
-	    drive-20gb|drive20gb|20gb|drive-50gb|drive50gb|50gb|drive-200gb|drive200gb|200gb|drive-400gb|drive400gb|400gb|
-	    drive-1tb|drive1tb|1tb|drive-2tb|drive2tb|2tb|drive-4tb|drive4tb|4tb|drive-8tb|drive8tb|8tb|drive-16tb|drive16tb|16tb|
-	    vault|
-	    vfe|
-	    coordinate
+<ProductID> ::=
+	Google-Apps|
+	Google-Chrome-Device-Management|
+	Google-Coordinate|
+	Google-Drive-storage|
+	Google-Vault
+<SKUID> ::=
+	gafb|gafw|basic|gsuitebasic|Google-Apps-For-Business|
+	gafg|gsuitegovernment|gsuitegov|Google-Apps-For-Government|
+	gams|postini|gsuitegams|gsuitepostini|gsuitemessagesecurity|Google-Apps-For-Postini|
+	gal|lite|gsuitelite|Google-Apps-Lite|
+	gau|unlimited|gsuitebusiness|Google-Apps-Unlimited|
+	gae|enterprise|gsuiteenterprise|1010020020|
+	chrome|cdm|googlechromedevicemanagement|Google-Chrome-Device-Management|
+	coordinate|googlecoordinate|Google-Coordinate|
+	drive20gb|20gb|googledrivestorage20gb|Google-Drive-storage-20GB|
+	drive50gb|50gb|googledrivestorage50gb|Google-Drive-storage-50GB|
+	drive200gb|200gb|googledrivestorage200gb|Google-Drive-storage-200GB|
+	drive400gb|400gb|googledrivestorage400gb|Google-Drive-storage-400GB|
+	drive1tb|1tb|googledrivestorage1tb|Google-Drive-storage-1TB|
+	drive2tb|2tb|googledrivestorage2tb|Google-Drive-storage-2TB|
+	drive4tb|4tb|googledrivestorage4tb|Google-Drive-storage-4TB|
+	drive8tb|8tb|googledrivestorage8tb|Google-Drive-storage-8TB|
+	drive16tb|16tb|googledrivestorage16tb|Google-Drive-storage-16TB|
+	vault|googlevault|Google-Vault|
+	vfe|googlevaultformeremployee|Google-Vault-Former-Employee
 <Charset> ::= ascii|mbcs|utf-8|utf-8-sig|utf-16|<String>
 <FileFormat> ::= csv|html|txt|tsv|jpeg|jpg|png|svg|pdf|rtf|pptx|xlsx|docx|odt|ods|openoffice|ms|microsoft|micro$oft
 <Language> ::= ar|bn|bg|ca|zh-CN|zh-TW|hr|cs|da|nl|en|en-GB|et|fi|fr|de|el|gu|iw|is|in|it|ja|kn|ko|lv|lt|ms|ml|mr|no|or|fa|pl|pt-BR|pt-PT|ro|ru|sr|sk|sl|es|sv|tl|ta|te|th|tr|uk|ur|vi
@@ -67,7 +84,7 @@ Named items
 <CrOSItem> ::= <CrOSID>|(query:<QueryCrOS>)
 <DestEmailAddress> ::= <EmailAddress>
 <DomainAlias> ::= <String>
-<DriveFileACLRole> :: =commenter|editor|owner|reader|writer
+<DriveFileACLRole> :: =commenter|editor|organizer|owner|reader|writer
 <DriveFileID> ::= <String>
 <DriveFileURL> :: = https://docs.google.com/a/<DomainName>/document/d/<DriveFileID>/<String>
 <DriveFileItem> ::= <DriveFileID>|<DriveFileURL>
@@ -121,13 +138,34 @@ Named items
 <RoleAssignmentID> ::= <String>
 <SchemaName> ::= <String>
 <Section> ::= <String>
+<S/MIMEID> ::= <String>	
 <StudentItem> ::= <EmailAddress>|<UniqueID>|<String>
+<TeamDriveID> ::= <String>
 <Timezone> ::= <String>
 <Title> ::= <String>
 <URI> ::= <String>
 <URL> ::= <String>
 <UserItem> ::= <EmailAddress>|<UniqueID>|<String>

+<CourseFieldName> ::=
+	alternatelink|
+	coursegroupemail|
+	coursematerialsets|
+	coursestate|
+	creationtime|
+	description|
+	descriptionheading|
+	enrollmentcode|
+	guardiansenabled|
+	id|
+	name|
+	ownerid|
+	room|
+	section|
+	teacherfolder|
+	teachergroupemail|
+	updatetime
+<CourseFieldNameList> ::= "<CourseFieldName>(,<CourseFieldName>)*"

 <CrOSFieldName> ::=
 	activetimeranges|timeranges|
@@ -231,6 +269,7 @@ Named items
 	customreplyto|
 	defaultmessagedenynotificationtext|
 	description|
+	directmemberscount|
 	email|
 	id|
 	includeinglobaladdresslist|gal|
@@ -289,6 +328,8 @@ Named items
 	ipwhitelisted|
 	isdelegatedadmin|admin|isadmin|
 	ismailboxsetup|
+	is2svenforced|
+	is2svenrolled|
 	lastlogintime|
 	noneditablealiases|aliases|nicknames|
 	notes|note|
@@ -308,35 +349,35 @@ Named Lists
 Lists can be in the following formats
 Items, separated by commas, without spaces or commas in the items themselves: item(,item)*
 Items, separated by spaces, without spaces or commas in the items themselves: "item( item)*"
-Items, separated by commas, with spaces or commas in the items themselves: "'it em'(,'it em')*"
-Items, separated by spaces, with spaces or commas in the items themselves: "'it em'( 'it em')*"
+Items, separated by commas, with spaces or commas in the items themselves: "'it em'(,'it,em')*"
+Items, separated by spaces, with spaces or commas in the items themselves: "'it em'( 'it,em')*"

-<ACLList> ::== '<ACLScope>(,<ACLScope>)*'
-<CalendarList> ::= '<CalendarItem>(,<CalendarItem>)*'
-<CourseAliasList> ::= '<CourseAlias>(,<CourseAlias>)*'
-<CourseIDList> ::= '<CourseID>(,<CourseID>)*'
-<CrOSFieldNameList> ::= '<CrOSFieldName>(,<CrOSFieldName>)*'
-<CrOSList> ::= '<CrOSID>(,<CrOSID>)*'
-<DriveFileList> ::= '<DriveFileItem>(,<DriveFileItem>)*'
-<EmailAddressList> ::= '<EmailAddress>(,<EmailAddress>)*'
-<EventIDList> ::= '<EventID>(,<EventID>)*'
-<FileFormatList> ::= '<FileFormat>(,<FileFormat)*'
-<FilterIDList> ::= '<FilterID>(,<FilterID>)*'
-<GroupFieldNameList> ::= '<GroupFieldName>(,<GroupFieldName>)*'
-<GroupList> ::= '<GroupItem>(,<GroupItem>)*'
-<GuardianStateList> ::= '<GuardianState>(,<GuardianState>)*'
-<LabelNameList> ::= '<LabelName>(,<LabelName)*'
-<MembersFieldNameList> ::= '<MembersFieldName>(,<MembersFieldName>)*'
-<MobileList> ::= '<MobileId>(,<MobileId>)*'
-<OrgUnitList> ::== '<OrgUnitPath>(,<OrgUnitPath>)*'
-<PrinterIDList> ::= '<PrinterID>(,<PrinterID>)*'
-<ProductIDList> ::= '(<ProductID>|SKUID>)(,<ProductID>|SKUID>)*'
-<PrintJobIDList> ::= '<PrintJobID>(,<PrintJobID>)*'
-<ResourceIDList> ::= '<ResourceID>(,<ResourceID>)*'
-<SKUIDList> ='<SKUID>(,<SKUID>)*'
-<SchemaNameList> ::= '<SchemaName>(,<SchemaName>)*'
-<UserFieldNameList> ::= '<UserFieldName>(,<UserFieldName>)*'
-<UserList> ::= '<UserItem>(,<UserItem>)*'
+<ACLList> ::== "<ACLScope>(,<ACLScope>)*"
+<CalendarList> ::= "<CalendarItem>(,<CalendarItem>)*"
+<CourseAliasList> ::= "<CourseAlias>(,<CourseAlias>)*"
+<CourseIDList> ::= "<CourseID>(,<CourseID>)*"
+<CrOSFieldNameList> ::= "<CrOSFieldName>(,<CrOSFieldName>)*"
+<CrOSList> ::= "<CrOSID>(,<CrOSID>)*"
+<DriveFileList> ::= "<DriveFileItem>(,<DriveFileItem>)*"
+<EmailAddressList> ::= "<EmailAddress>(,<EmailAddress>)*"
+<EventIDList> ::= "<EventID>(,<EventID>)*"
+<FileFormatList> ::= "<FileFormat>(,<FileFormat)*"
+<FilterIDList> ::= "<FilterID>(,<FilterID>)*"
+<GroupFieldNameList> ::= "<GroupFieldName>(,<GroupFieldName>)*"
+<GroupList> ::= "<GroupItem>(,<GroupItem>)*"
+<GuardianStateList> ::= "<GuardianState>(,<GuardianState>)*"
+<LabelNameList> ::= "<LabelName>(,<LabelName)*"
+<MembersFieldNameList> ::= "<MembersFieldName>(,<MembersFieldName>)*"
+<MobileList> ::= "<MobileId>(,<MobileId>)*"
+<OrgUnitList> ::== "<OrgUnitPath>(,<OrgUnitPath>)*"
+<PrinterIDList> ::= "<PrinterID>(,<PrinterID>)*"
+<ProductIDList> ::= "(<ProductID>|SKUID>)(,<ProductID>|SKUID>)*"
+<PrintJobIDList> ::= "<PrintJobID>(,<PrintJobID>)*"
+<ResourceIDList> ::= "<ResourceID>(,<ResourceID>)*"
+<SKUIDList> ="<SKUID>(,<SKUID>)*"
+<SchemaNameList> ::= "<SchemaName>(,<SchemaName>)*"
+<UserFieldNameList> ::= "<UserFieldName>(,<UserFieldName>)*"
+<UserList> ::= "<UserItem>(,<UserItem>)*"

 Specify a collection of ChromeOS devices by directly specifying them
 <CrOSTypeEntity> ::=
@@ -459,7 +500,7 @@ Item attributes
 	(im|ims clear|(type work|home|other|(custom <String>) protocol aim|gtalk|icq|jabber|msn|net_meeting|qq|skype|yahoo|(custom_protocol <String>) <String> [notprimary|primary]))|
 	(ipwhitelisted <Boolean>)|
 	(lastname|familyname <String>)|
-	(note|notes clear|([text_plain|text_html] <String>|(file <FileName>)))|
+	(note|notes clear|([text_plain|text_html] <String>|(file <FileName> [charset <CharSet>])))|
 	(organization|organizations clear|([type domain_only|school|unknown|work] [customtype <String>] [name <String>] [title <String>] [department <String>] [symbol <String>]
 		[costcenter <String>]  [location <String>] [description <String>] [domain <String>] notprimary|primary))|
 	(org|ou|orgunitpath <OrgUnitPath>)
@@ -469,7 +510,7 @@ Item attributes
 	(relation|relations clear|(spouse|child|mother|father|parent|brother|sister|friend|relative|domestic_partner|manager|assistant|referred_by|partner|<String> <String>))|
 	(suspended <Boolean>)|
 	(website|websites clear|(home_page|blog|profile|work|home|other|ftp|reservations|app_install_page|<String> <URL> [notprimary|primary]))|
-	(<SchemaName>.<FieldName> [multivalued|multivalue|value [type work|home|other|(custom <String>)]] <String>)
+	(<SchemaName>.<FieldName> [multivalued|multivalue|value|multinonempty [type work|home|other|(custom <String>)]] <String>)

 gam version [check] [simple]
 gam help
@@ -481,7 +522,7 @@ You can make substitutions in <GAMArgumentList> with values from the CSV file.
 An argument containing exactly ~xxx is replaced by the value of field xxx from the CSV file
 An argument containing instances of ~~xxx~~ has xxx replaced by the value of field xxx from the CSV file

-Example: gam csv Users.csv gam update user '~primaryEmail' address type work unstructured '~~Street~~, ~~City~~, ~~State~~ ~~ZIP~~'
+Example: gam csv Users.csv gam update user "~primaryEmail" address type work unstructured "~~Street~~, ~~City~~, ~~State~~ ~~ZIP~~"
 Each user (~primaryEmail, e.g. foo@bar.com) would have their work address updated

 gam create project [<EmailAddress>]
@@ -494,6 +535,27 @@ gam <UserTypeEntity> check serviceaccount

 gam whatis <EmailItem>

+gam create resoldcustomer <CustomerDomain> (customer_auth_token <String>)
+	(email|alternate_email <EmailAddress>) (name|organization_name <String>) (contact|contact_name <String>) [phone|phone_number <String>]
+	[address|address1 <String>] [address2 <String>] [address3 <String>]
+	[locality|city <String>] [region|state <String>] [postal|postal_code <String>] [country|country_code <String>]
+gam update resoldcustomer <CustomerID> [customer_auth_token <String>]
+	[email|alternate_email <EmailAddress>] [name|organization_name <String>] [contact|contact_name <String>] [phone|phone_number <String>]
+	[address|address1 <String>] [address2 <String>] [address3 <String>]
+	[locality|city <String>] [region|state <String>] [postal|postal_code <String>] [country|country_code <String>]
+gam info resoldcustomer <CustomerID>
+
+gam create resoldsubscription <CustomerID> (sku <SKUID>)
+	 (plan annual_monthly_pay|annual_yearly_pay|flexible|trial) (seats <NumberOfSeats> <MaximumNumberOfSeats>)
+	 [customer_auth_token <String>] [deal <String>] [purchaseorderid <String>]
+gam update resoldsubscription <CustomerID> <SKUID>
+	activate|suspend|startpaidservice|
+	(renewal auto_renew_monthly_pay|auto_renew_yearly_pay|cancel|renew_current_users_monthly_pay|renew_current_users_yearly_pay|switch_to_pay_as_you_go)|
+	(seats <NumberOfSeats> [<MaximumNumberOfSeats>])|
+	(plan annual_monthly_pay|annual_yearly_pay|flexible|trial [deal <String>] [purchaseorderid <String>] [seats <NumberOfSeats> [<MaximumNumberOfSeats>]])
+gam delete resoldsubscription <CustomerID> <SKUID> cancel|downgrade|transfer_to_direct
+gam info resoldsubscriptions <CustomerID> [customer_auth_token <String>]
+
 gam report users|user [todrive]
 	[date <Date>] [(user all|<UserItem>)] [filter|filters <String>] [fields|parameters <String>]
 gam report customers|customer|domain [todrive]
@@ -552,11 +614,11 @@ gam calendar <CalendarItem> deleteevent (id|eventid <EventID>)* (query|eventquer
 gam calendar <CalendarItem> wipe

 gam update cros <CrOSItem> (<CrOSAttributes>+)|(action deprovision_same_model_replace|deprovision_different_model_replace|deprovision_retiring_device|disable|reenable [acknowledge_device_touch_requirement])
-gam info cros <CrOSItem> [nolists] [listlimit <Number>]
+gam info cros <CrOSItem> [nolists] [listlimit <Number>] [start <Date>] [end <Date>]
 	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>]

 gam print cros [todrive] [query <QueryCrOS>]
-	[orderby <CrOSOrderByFieldName> [ascending|descending]] [nolists] [listlimit <Number>]
+	[orderby <CrOSOrderByFieldName> [ascending|descending]] [nolists] [listlimit <Number>] [start <Date>] [end <Date>]
 	[basic|full|allfields] <CrOSFieldName>* [fields <CrOSFieldNameList>]
 gam <CrOSTypeEntity> print

@@ -570,11 +632,27 @@ Prints a header row and selected fields for specified CrOS devices.

 The basic argument yields these column headers: deviceId,annotatedAssetId,annotatedLocation,annotatedUser,lastSync,notes,serialNumber,status
 The full argument yields all column headers including two headers, recentUsers and activeTimeRanges,
-that repeat with two subvalues each, yielding a large number of columns that make the output hard to process.
+that repeat with two/four subvalues each, yielding a large number of columns that make the output hard to process.
 The nolists argument suppresses these two headers; if you want these headers in a more manageable form use the following arguments.
-The listlimit <Number> argument limits the number of repetitions to <Number>. If <Number> equals zero, there is no limit.
-If recentusers is specified as a field, each pair of values for recentUsers is put on a separate row with all of the other headers.
-If timeranges is specified as a field, each  pair of values for activeTimeRanges is put on a separate row with all of the other headers.
+If recentusers is specified, for each recent user, the columns recentUsers.email and recentUsers.type are output on a separate row
+with all of the other headers.
+If timeranges is specified, for each time range entry, the columns activeTimeRanges.date, activeTimeRange.activeTime,
+activeTimeRanges.duration and activeTimeRanges.minutes are output on a separate row with all of the other headers.
+The listlimit <Number> argument limits the number of repetitions to <Number>; if not specified or <Number> equals zero, there is no limit.
+The start <Date> and end <Date> arguments filter the time ranges.
+
+gam print crosactivity [todrive] [query <QueryCrOS>]
+	[recentusers] [timeranges] [both] [listlimit <Number>] [start <Date>] [end <Date>] [delimiter <String>] 
+
+The basic column headers are: deviceId,annotatedAssetId,annotatedLocation,serialNumber,orgUnitPath.
+If recentusers is specified, all of the recent users email addresses, separated by the delimiter <String>,
+with header recentUsers.email, are output with the basic headers.
+If timeranges is specified, for each time range entry, activeTimeRanges.date and activeTimeRanges.duration and activeTimeRanges.minutes,
+are output on a separate row with the basic headers.
+The default is to include both recentusers and timeranges.
+The listlimit <Number> argument limits the number of recent users and time ranges to <Number>; if not specified or <Number> equals zero, there is no limit.
+The start <Date> and end <Date> arguments filter the time ranges.
+Delimiter defaults to comma.

 gam update mobile <MobileItem> <MobileAttributes>+
 gam delete mobile <MobileItem>
@@ -617,7 +695,7 @@ gam info schema <SchemaName>
 gam show schema|schemas
 gam print schema|schemas

-gam create user <EmailAddress> <UserAttrubutes>*
+gam create user <EmailAddress> <UserAttributes>*
 gam update user <UserItem> <UserAttributes>* [clearschema <SchemaName>] [clearschema <SchemaName>.<FieldName>]
 gam delete user <UserItem>
 gam undelete user <UserItem> [org|ou <OrgUnitPath>]
@@ -626,7 +704,7 @@ gam info user [<UserItem>] [noaliases] [nogroups] [nolicenses|nolicences] [nosch
 gam print users [todrive] ([domain <DomainName>] [query <QueryUser>] [deleted_only|only_deleted])
 	[groups] [license|licenses|licence|licences] [emailpart|emailparts|username]
 	[orderby <UserOrderByFieldName> [ascending|descending]] [userview]
-	[basic|full|allfields | <UserFieldName>* | fields <UserFieldNameList>] [schemas|custom all|<SchemaNameList>]
+	[allfields|basic|full | ((<UserFieldName>* | fields <UserFieldNameList>) [schemas|custom all|<SchemaNameList>])]
 gam <UserTypeEntity> print

 Summary of printing:
@@ -644,6 +722,7 @@ gam update course <CourseID> <CourseAttributes>+
 gam delete course <CourseID>
 gam info course <CourseID>
 gam print courses [todrive] [teacher <UserItem>] [student <UserItem>] [alias|aliases] [delimiter <String>]
+	[show all|students|teachers] [countsonly] [fields <CourseFieldNameList>] [skipfields <CourseFieldNameList>]

 gam course <CourseID> add alias <CourseAlias>
 gam course <CourseID> delete alias <CourseAlias>
@@ -693,7 +772,7 @@ gam <UserTypeEntity> delete|del backupcodes|backupcode|verificationcodes
 gam <UserTypeEntity> show backupcodes|backupcode|verificationcodes

 gam <UserTypeEntity> add calendar <CalendarItem> <CalendarAttributes>*
-gam <UserTypeEntity> update calendar <CalendarItem> <CalendarAttributes>+
+gam <UserTypeEntity> update calendar <CalendarItem>|primary <CalendarAttributes>+
 gam <UserTypeEntity> delete|del calendar <CalendarItem>
 gam <UserTypeEntity> show calendars
 gam <UserTypeEntity> info calendar <CalendarItem>|primary
@@ -721,9 +800,9 @@ gam <UserTypeEntity> delete|del emptydrivefolders
 gam <UserTypeEntity> empty drivetrash

 gam <UserTypeEntity> add drivefileacl <DriveFileID> anyone|(user <UserItem>)|(group <GroupItem>)|(domain <DomainName>)
-	(role <DriveFileACLRole>) [withlink] [sendemail] [emailmessage <String>]
+	(role <DriveFileACLRole>) [withlink|discoverable] [sendemail] [emailmessage <String>]
 gam <UserTypeEntity> update drivefileacl <DriveFileID> <PermissionID>
-	(role <DriveFileACLRole>) [withlink] [transferownership <Boolean>]
+	(role <DriveFileACLRole>) [withlink|discoverable] [removeexpiration]
 gam <UserTypeEntity> delete|del drivefileacl <DriveFileID> <PermissionID>
 gam <UserTypeEntity> show drivefileacl <DriveFileID>

@@ -731,9 +810,9 @@ gam <UserTypeEntity> delete|del alias|aliases

 gam <UserTypeEntity> delete|del group|groups

-gam <UserTypeEntity> add license <SKUID>
-gam <UserTypeEntity> update license <SKUID> [from] <SKUID>
-gam <UserTypeEntity> delete|del license <SKUID>
+gam <UserTypeEntity> add license <SKUID> [product|productid <ProductID>]
+gam <UserTypeEntity> update license <SKUID> [product|productid <ProductID>] [from] <SKUID>
+gam <UserTypeEntity> delete|del license <SKUID> [product|productid <ProductID>]

 gam <UserTypeEntity> update photo <FileNamePattern>
 gam <UserTypeEntity> delete|del photo
@@ -747,7 +826,7 @@ gam <UserTypeEntity> show tokens|token [clientid <ClientID>]
 gam <UserTypeEntity> print tokens|token [todrive] [clientid <ClientID>]
 gam print tokens|token [todrive] [clientid <ClientID>] [<UserTypeEntity>]

-gam <UserTypeEntity> update user <UserAttrubutes>
+gam <UserTypeEntity> update user <UserAttributes>

 gam <UserTypeEntity> deprovision|deprov

@@ -802,9 +881,21 @@ gam <UserTypeEntity> show sendas [format]
 gam <UserTypeEntity> info sendas <EmailAddress> [format]
 gam <UserTypeEntity> print sendas [todrive]

+gam <UserTypeEntity> add smime file <FileName> [password <Password>] [sendas|sendasemail <EmailAddress>] [default]
+gam <UserTypeEntity> update smime [id <S/MIMEID>] [sendas|sendasemail <EmailAddress>] [default]
+gam <UserTypeEntity> delete smime [id <S/MIMEID>] [sendas|sendasemail <EmailAddress>]
+gam <UserTypeEntity> show smime [primaryonly]
+gam <UserTypeEntity> print smime [todrive] [primaryonly]
+
 gam <UserTypeEntity> signature|sig <String>|(file <FileName> [charset <Charset>]) (replace <Tag> <String>)* [html] [name <String>] [replyto <EmailAddress>] [default] [treatasalias <Boolean>]
 gam <UserTypeEntity> show signature|sig [format]

+gam <UserTypeEntity> add teamdrive <Name>
+gam <UserTypeEntity> update teamdrive <TeamDriveID> [name <Name>]
+gam <UserTypeEntity> delete teamdrive <TeamDriveID>
+gam <UserTypeEntity> show teamdrives
+gam <UserTypeEntity> print teamdrives [todrive]
+
 gam <UserTypeEntity> vacation <FalseValues>
 gam <UserTypeEntity> vacation <TrueValues> subject <String> (message <String>)|(file <FileName> [charset <CharSet>]) (replace <Tag> <String>)* [html]
 	[contactsonly] [domainonly] [startdate <Date>] [enddate <Date>]
--- a/src/gam-install.sh
+++ b/src/gam-install.sh
@@ -10,6 +10,7 @@ OPTIONS:
   -d      Directory where gam folder will be installed. Default is \$HOME/bin/
   -a      Architecture to install (i386, x86_64, arm). Default is to detect your arch with "uname -m".
   -o      OS we are running (linux, macos). Default is to detect your OS with "uname -s".
+   -l      Just upgrade GAM to latest version. Skips project creation and auth.
   -p      Profile update (true, false). Should script add gam command to environment. Default is true.
   -u      Admin user email address to use with GAM. Default is to prompt.
   -r      Regular user email address. Used to test service account access to user data. Default is to prompt.
@@ -21,20 +22,22 @@ target_dir="$HOME/bin"
 gamarch=$(uname -m)
 gamos=$(uname -s)
 update_profile=true
+upgrade_only=false
 gamversion="latest"
 adminuser=""
 regularuser=""
-while getopts "hd:a:o:p:u:r:v:" OPTION
+while getopts "hd:a:o:lp:u:r:v:" OPTION
 do
     case $OPTION in
         h) usage; exit;;
-         d) target_dir=$OPTARG;;
-         a) gamarch=$OPTARG;;
-         o) gamos=$OPTARG;;
-         p) update_profile=$OPTARG;;
-         u) adminuser=$OPTARG;;
-         r) regularuser=$OPTARG;;
-         v) gamversion=$OPTARG;;
+         d) target_dir="$OPTARG";;
+         a) gamarch="$OPTARG";;
+         o) gamos="$OPTARG";;
+         l) upgrade_only=true;;
+         p) update_profile="$OPTARG";;
+         u) adminuser="$OPTARG";;
+         r) regularuser="$OPTARG";;
+         v) gamversion="$OPTARG";;
         ?) usage; exit;;
     esac
 done
@@ -154,10 +157,10 @@ echo_yellow "Downloading file $name from $browser_download_url to $temp_archive_
 # Save archive to temp w/o losing our path
 (cd $temp_archive_dir && curl -O -L $browser_download_url)

-mkdir -p $target_dir
+mkdir -p "$target_dir"

 echo_yellow "Extracting archive to $target_dir"
-tar xf $temp_archive_dir/$name -C $target_dir
+tar xf $temp_archive_dir/$name -C "$target_dir"
 rc=$?
 if (( $rc != 0 )); then
  echo_red "ERROR: extracting the GAM archive with tar failed with error $rc. Exiting."
@@ -166,6 +169,19 @@ else
  echo_green "Finished extracting GAM archive."
 fi

+if [ "$upgrade_only" = true ]; then
+  echo_green "Here's information about your GAM upgrade:"
+  "$target_dir/gam/gam" version
+  rc=$?
+  if (( $rc != 0 )); then
+    echo_red "ERROR: Failed running GAM for the first time with $rc. Please report this error to GAM mailing list. Exiting."
+    exit
+  fi
+
+  echo_green "GAM upgrade complete!"
+  exit
+fi
+
 # Update profile to add gam command
 if [ "$update_profile" = true ]; then
  alias_line="alias gam=\"$target_dir/gam/gam\""
@@ -185,7 +201,7 @@ while true; do
      break
      ;;
    [Nn]*)
-      touch $target_dir/gam/nobrowser.txt > /dev/null 2>&1
+      touch "$target_dir/gam/nobrowser.txt" > /dev/null 2>&1
      break
      ;;
    *)
@@ -203,14 +219,14 @@ while true; do
      if [ "$adminuser" == "" ]; then
        read -p "Please enter your G Suite admin email address: " adminuser
      fi
-      $target_dir/gam/gam create project $adminuser
+      "$target_dir/gam/gam" create project $adminuser
      rc=$?
      if (( $rc == 0 )); then
        echo_green "Project creation complete."
        project_created=true
        break
      else
-        echo_red "Projection creation failed. Trying again. Say N to skip projection creation."
+        echo_red "Project creation failed. Trying again. Say N to skip project creation."
      fi
      ;;
    [Nn]*)
@@ -228,7 +244,7 @@ while $project_created; do
  read -p "Are you ready to authorize GAM to perform G Suite management operations as your admin account? (yes or no) " yn
  case $yn in
    [Yy]*)
-      $target_dir/gam/gam oauth create $adminuser
+      "$target_dir/gam/gam" oauth create $adminuser
      rc=$?
      if (( $rc == 0 )); then
        echo_green "Admin authorization complete."
@@ -257,7 +273,7 @@ while $project_created; do
        read -p "Please enter the email address of a regular G Suite user: " regularuser
      fi
      echo_yellow "Great! Checking service account scopes.This will fail the first time. Follow the steps to authorize and retry. It can take a few minutes for scopes to PASS after they've been authorized in the admin console."
-      $target_dir/gam/gam user $adminuser check serviceaccount
+      "$target_dir/gam/gam" user $adminuser check serviceaccount
      rc=$?
      if (( $rc == 0 )); then
        echo_green "Service account authorization complete."
@@ -278,7 +294,7 @@ while $project_created; do
 done

 echo_green "Here's information about your new GAM installation:"
-$target_dir/gam/gam version
+"$target_dir/gam/gam" version
 rc=$?
 if (( $rc != 0 )); then
  echo_red "ERROR: Failed running GAM for the first time with $rc. Please report this error to GAM mailing list. Exiting."
--- a/src/gam.py
+++ b/src/gam.py
--- a/src/googleapiclient/init.py
+++ b/src/googleapiclient/init.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-__version__ = "1.6.1"
+__version__ = "1.6.2"

 # Set default logging handler to avoid "No handler found" warnings.
 import logging
--- a/src/googleapiclient/_auth.py
+++ b/src/googleapiclient/_auth.py
@@ -14,8 +14,6 @@

 """Helpers for authentication using oauth2client or google-auth."""

-import httplib2
-
 try:
    import google.auth
    import google.auth.credentials
@@ -31,6 +29,8 @@ try:
 except ImportError:  # pragma: NO COVER
    HAS_OAUTH2CLIENT = False

+from googleapiclient.http import build_http
+

 def default_credentials():
    """Returns Application Default Credentials."""
@@ -86,6 +86,7 @@ def authorized_http(credentials):
    """
    if HAS_GOOGLE_AUTH and isinstance(
            credentials, google.auth.credentials.Credentials):
-        return google_auth_httplib2.AuthorizedHttp(credentials)
+        return google_auth_httplib2.AuthorizedHttp(credentials,
+                                                   http=build_http())
    else:
-        return credentials.authorize(httplib2.Http())
+        return credentials.authorize(build_http())
--- a/src/googleapiclient/discovery.py
+++ b/src/googleapiclient/discovery.py
@@ -61,6 +61,7 @@ from googleapiclient.errors import MediaUploadSizeError
 from googleapiclient.errors import UnacceptableMimeTypeError
 from googleapiclient.errors import UnknownApiNameOrVersion
 from googleapiclient.errors import UnknownFileType
+from googleapiclient.http import build_http
 from googleapiclient.http import BatchHttpRequest
 from googleapiclient.http import HttpMock
 from googleapiclient.http import HttpMockSequence
@@ -97,6 +98,7 @@ V2_DISCOVERY_URI = ('https://{api}.googleapis.com/$discovery/rest?'
                    'version={apiVersion}')
 DEFAULT_METHOD_DOC = 'A description of how to use this function'
 HTTP_PAYLOAD_METHODS = frozenset(['PUT', 'POST', 'PATCH'])
+
 _MEDIA_SIZE_BIT_SHIFTS = {'KB': 10, 'MB': 20, 'GB': 30, 'TB': 40}
 BODY_PARAMETER_DEFAULT_VALUE = {
    'description': 'The request body.',
@@ -115,6 +117,7 @@ MEDIA_MIME_TYPE_PARAMETER_DEFAULT_VALUE = {
    'type': 'string',
    'required': False,
 }
+_PAGE_TOKEN_NAMES = ('pageToken', 'nextPageToken')

 # Parameters accepted by the stack, but not visible via discovery.
 # TODO(dhermes): Remove 'userip' in 'v2'.
@@ -213,7 +216,10 @@ def build(serviceName,
      'apiVersion': version
      }

-  discovery_http = http if http is not None else httplib2.Http()
+  if http is None:
+    discovery_http = build_http()
+  else:
+    discovery_http = http

  for discovery_url in (discoveryServiceUrl, V2_DISCOVERY_URI,):
    requested_url = uritemplate.expand(discovery_url, params)
@@ -328,6 +334,10 @@ def build_from_document(
  if http is not None and credentials is not None:
    raise ValueError('Arguments http and credentials are mutually exclusive.')

+  if developerKey is not None and credentials is not None:
+    raise ValueError(
+      'Arguments developerKey and credentials are mutually exclusive.')
+
  if isinstance(service, six.string_types):
    service = json.loads(service)

@@ -350,8 +360,9 @@ def build_from_document(
    scopes = list(
      service.get('auth', {}).get('oauth2', {}).get('scopes', {}).keys())

-    # If so, then the we need to setup authentication.
-    if scopes:
+    # If so, then the we need to setup authentication if no developerKey is
+    # specified.
+    if scopes and not developerKey:
      # If the user didn't pass in credentials, attempt to acquire application
      # default credentials.
      if credentials is None:
@@ -366,7 +377,7 @@ def build_from_document(
    # If the service doesn't require scopes then there is no need for
    # authentication.
    else:
-      http = httplib2.Http()
+      http = build_http()

  if model is None:
    features = service.get('features', [])
@@ -718,7 +729,11 @@ def createMethod(methodName, methodDesc, rootDesc, schema):

    for name in parameters.required_params:
      if name not in kwargs:
-        raise TypeError('Missing required parameter "%s"' % name)
+        # temporary workaround for non-paging methods incorrectly requiring
+        # page token parameter (cf. drive.changes.watch vs. drive.changes.list)
+        if name not in _PAGE_TOKEN_NAMES or _findPageTokenName(
+            _methodProperties(methodDesc, schema, 'response')):
+          raise TypeError('Missing required parameter "%s"' % name)

    for name, regex in six.iteritems(parameters.pattern_params):
      if name in kwargs:
@@ -921,13 +936,20 @@ def createMethod(methodName, methodDesc, rootDesc, schema):
  return (methodName, method)


-def createNextMethod(methodName):
+def createNextMethod(methodName,
+                     pageTokenName='pageToken',
+                     nextPageTokenName='nextPageToken',
+                     isPageTokenParameter=True):
  """Creates any _next methods for attaching to a Resource.

  The _next methods allow for easy iteration through list() responses.

  Args:
    methodName: string, name of the method to use.
+    pageTokenName: string, name of request page token field.
+    nextPageTokenName: string, name of response page token field.
+    isPageTokenParameter: Boolean, True if request page token is a query
+        parameter, False if request page token is a field of the request body.
  """
  methodName = fix_method_name(methodName)

@@ -945,24 +967,24 @@ Returns:
    # Retrieve nextPageToken from previous_response
    # Use as pageToken in previous_request to create new request.

-    if 'nextPageToken' not in previous_response or not previous_response['nextPageToken']:
+    nextPageToken = previous_response.get(nextPageTokenName, None)
+    if not nextPageToken:
      return None

    request = copy.copy(previous_request)

-    pageToken = previous_response['nextPageToken']
-    parsed = list(urlparse(request.uri))
-    q = parse_qsl(parsed[4])
-
-    # Find and remove old 'pageToken' value from URI
-    newq = [(key, value) for (key, value) in q if key != 'pageToken']
-    newq.append(('pageToken', pageToken))
-    parsed[4] = urlencode(newq)
-    uri = urlunparse(parsed)
-
-    request.uri = uri
-
-    logger.info('URL being requested: %s %s' % (methodName,uri))
+    if isPageTokenParameter:
+        # Replace pageToken value in URI
+        request.uri = _add_query_parameter(
+            request.uri, pageTokenName, nextPageToken)
+        logger.info('Next page request URL: %s %s' % (methodName, request.uri))
+    else:
+        # Replace pageToken value in request body
+        model = self._model
+        body = model.deserialize(request.body)
+        body[pageTokenName] = nextPageToken
+        request.body = model.serialize(body)
+        logger.info('Next page request body: %s %s' % (methodName, body))

    return request

@@ -1110,19 +1132,59 @@ class Resource(object):
                               method.__get__(self, self.__class__))

  def _add_next_methods(self, resourceDesc, schema):
-    # Add _next() methods
-    # Look for response bodies in schema that contain nextPageToken, and methods
-    # that take a pageToken parameter.
-    if 'methods' in resourceDesc:
-      for methodName, methodDesc in six.iteritems(resourceDesc['methods']):
-        if 'response' in methodDesc:
-          responseSchema = methodDesc['response']
-          if '$ref' in responseSchema:
-            responseSchema = schema.get(responseSchema['$ref'])
-          hasNextPageToken = 'nextPageToken' in responseSchema.get('properties',
-                                                                   {})
-          hasPageToken = 'pageToken' in methodDesc.get('parameters', {})
-          if hasNextPageToken and hasPageToken:
-            fixedMethodName, method = createNextMethod(methodName + '_next')
-            self._set_dynamic_attr(fixedMethodName,
-                                   method.__get__(self, self.__class__))
+    # Add _next() methods if and only if one of the names 'pageToken' or
+    # 'nextPageToken' occurs among the fields of both the method's response
+    # type either the method's request (query parameters) or request body.
+    if 'methods' not in resourceDesc:
+      return
+    for methodName, methodDesc in six.iteritems(resourceDesc['methods']):
+      nextPageTokenName = _findPageTokenName(
+          _methodProperties(methodDesc, schema, 'response'))
+      if not nextPageTokenName:
+        continue
+      isPageTokenParameter = True
+      pageTokenName = _findPageTokenName(methodDesc.get('parameters', {}))
+      if not pageTokenName:
+        isPageTokenParameter = False
+        pageTokenName = _findPageTokenName(
+            _methodProperties(methodDesc, schema, 'request'))
+      if not pageTokenName:
+        continue
+      fixedMethodName, method = createNextMethod(
+          methodName + '_next', pageTokenName, nextPageTokenName,
+          isPageTokenParameter)
+      self._set_dynamic_attr(fixedMethodName,
+                             method.__get__(self, self.__class__))
+
+
+def _findPageTokenName(fields):
+  """Search field names for one like a page token.
+
+  Args:
+    fields: container of string, names of fields.
+
+  Returns:
+    First name that is either 'pageToken' or 'nextPageToken' if one exists,
+    otherwise None.
+  """
+  return next((tokenName for tokenName in _PAGE_TOKEN_NAMES
+              if tokenName in fields), None)
+
+def _methodProperties(methodDesc, schema, name):
+  """Get properties of a field in a method description.
+
+  Args:
+    methodDesc: object, fragment of deserialized discovery document that
+      describes the method.
+    schema: object, mapping of schema names to schema descriptions.
+    name: string, name of top-level field in method description.
+
+  Returns:
+    Object representing fragment of deserialized discovery document
+    corresponding to 'properties' field of object corresponding to named field
+    in method description, if it exists, otherwise empty dict.
+  """
+  desc = methodDesc.get(name, {})
+  if '$ref' in desc:
+    desc = schema.get(desc['$ref'], {})
+  return desc.get('properties', {})
--- a/src/googleapiclient/http.py
+++ b/src/googleapiclient/http.py
@@ -80,6 +80,8 @@ MAX_URI_LENGTH = 2048

 _TOO_MANY_REQUESTS = 429

+DEFAULT_HTTP_TIMEOUT_SEC = 60
+

 def _should_retry_response(resp_status, content):
  """Determines whether a response should be retried.
@@ -815,6 +817,7 @@ class HttpRequest(object):
    if 'content-length' not in self.headers:
      self.headers['content-length'] = str(self.body_size)
    # If the request URI is too long then turn it into a POST request.
+    # Assume that a GET request never contains a request body.
    if len(self.uri) > MAX_URI_LENGTH and self.method == 'GET':
      self.method = 'POST'
      self.headers['x-http-method-override'] = 'GET'
@@ -1732,3 +1735,21 @@ def tunnel_patch(http):

  http.request = new_request
  return http
+
+
+def build_http():
+  """Builds httplib2.Http object
+
+  Returns:
+  A httplib2.Http object, which is used to make http requests, and which has timeout set by default.
+  To override default timeout call
+
+    socket.setdefaulttimeout(timeout_in_sec)
+
+  before interacting with this method.
+  """
+  if socket.getdefaulttimeout() is not None:
+    http_timeout = socket.getdefaulttimeout()
+  else:
+    http_timeout = DEFAULT_HTTP_TIMEOUT_SEC
+  return httplib2.Http(timeout=http_timeout)
--- a/src/googleapiclient/sample_tools.py
+++ b/src/googleapiclient/sample_tools.py
@@ -23,10 +23,10 @@ __all__ = ['init']


 import argparse
-import httplib2
 import os

 from googleapiclient import discovery
+from googleapiclient.http import build_http
 from oauth2client import client
 from oauth2client import file
 from oauth2client import tools
@@ -88,7 +88,7 @@ def init(argv, name, version, doc, filename, scope=None, parents=[], discovery_f
  credentials = storage.get()
  if credentials is None or credentials.invalid:
    credentials = tools.run_flow(flow, storage, flags)
-  http = credentials.authorize(http = httplib2.Http())
+  http = credentials.authorize(http=build_http())

  if discovery_filename is None:
    # Construct a service object via the discovery service.
--- a/src/googleapiclient/schema.py
+++ b/src/googleapiclient/schema.py
@@ -161,13 +161,14 @@ class Schemas(object):
    # Return with trailing comma and newline removed.
    return self._prettyPrintSchema(schema, dent=1)[:-2]

-  def get(self, name):
+  def get(self, name, default=None):
    """Get deserialized JSON schema from the schema name.

    Args:
      name: string, Schema name.
+      default: object, return value if name not found.
    """
-    return self.schemas[name]
+    return self.schemas.get(name, default)


 class _SchemaToStruct(object):
--- a/src/httplib2/init.py
+++ b/src/httplib2/init.py
@@ -23,7 +23,7 @@ __contributors__ = ["Thomas Broyer (t.broyer@ltgt.net)",
                    "Louis Nyffenegger",
                    "Alex Yu"]
 __license__ = "MIT"
-__version__ = "0.9.2"
+__version__ = "0.10.3"

 import re
 import sys
@@ -65,42 +65,54 @@ except ImportError:
        socks = None

 # Build the appropriate socket wrapper for ssl
+ssl = None
+ssl_SSLError = None
+ssl_CertificateError = None
 try:
-    import ssl # python 2.6
-    ssl_SSLError = ssl.SSLError
-    def _ssl_wrap_socket(sock, key_file, cert_file, disable_validation,
-                         ca_certs, ssl_version, hostname):
-        if disable_validation:
-            cert_reqs = ssl.CERT_NONE
-        else:
-            cert_reqs = ssl.CERT_REQUIRED
-        if ssl_version is None:
-            ssl_version = ssl.PROTOCOL_SSLv23
+    import ssl  # python 2.6
+except ImportError:
+    pass
+if ssl is not None:
+    ssl_SSLError = getattr(ssl, 'SSLError', None)
+    ssl_CertificateError = getattr(ssl, 'CertificateError', None)

-        if hasattr(ssl, 'SSLContext'): # Python 2.7.9
-            context = ssl.SSLContext(ssl_version)
-            context.verify_mode = cert_reqs
-            context.check_hostname = (cert_reqs != ssl.CERT_NONE)
-            if cert_file:
-                context.load_cert_chain(cert_file, key_file)
-            if ca_certs:
-                context.load_verify_locations(ca_certs)
-            return context.wrap_socket(sock, server_hostname=hostname)
-        else:
-            return ssl.wrap_socket(sock, keyfile=key_file, certfile=cert_file,
-                                   cert_reqs=cert_reqs, ca_certs=ca_certs,
-                                   ssl_version=ssl_version)
-except (AttributeError, ImportError):
-    ssl_SSLError = None
-    def _ssl_wrap_socket(sock, key_file, cert_file, disable_validation,
-                         ca_certs, ssl_version, hostname):
-        if not disable_validation:
-            raise CertificateValidationUnsupported(
-                    "SSL certificate validation is not supported without "
-                    "the ssl module installed. To avoid this error, install "
-                    "the ssl module, or explicity disable validation.")
-        ssl_sock = socket.ssl(sock, key_file, cert_file)
-        return httplib.FakeSocket(sock, ssl_sock)
+
+def _ssl_wrap_socket(sock, key_file, cert_file, disable_validation,
+                     ca_certs, ssl_version, hostname):
+    if disable_validation:
+        cert_reqs = ssl.CERT_NONE
+    else:
+        cert_reqs = ssl.CERT_REQUIRED
+    if ssl_version is None:
+        ssl_version = ssl.PROTOCOL_SSLv23
+
+    if hasattr(ssl, 'SSLContext'):  # Python 2.7.9
+        context = ssl.SSLContext(ssl_version)
+        context.verify_mode = cert_reqs
+        context.check_hostname = (cert_reqs != ssl.CERT_NONE)
+        if cert_file:
+            context.load_cert_chain(cert_file, key_file)
+        if ca_certs:
+            context.load_verify_locations(ca_certs)
+        return context.wrap_socket(sock, server_hostname=hostname)
+    else:
+        return ssl.wrap_socket(sock, keyfile=key_file, certfile=cert_file,
+                               cert_reqs=cert_reqs, ca_certs=ca_certs,
+                               ssl_version=ssl_version)
+
+
+def _ssl_wrap_socket_unsupported(sock, key_file, cert_file, disable_validation,
+                                 ca_certs, ssl_version, hostname):
+    if not disable_validation:
+        raise CertificateValidationUnsupported(
+                "SSL certificate validation is not supported without "
+                "the ssl module installed. To avoid this error, install "
+                "the ssl module, or explicity disable validation.")
+    ssl_sock = socket.ssl(sock, key_file, cert_file)
+    return httplib.FakeSocket(sock, ssl_sock)
+
+if ssl is None:
+    _ssl_wrap_socket = _ssl_wrap_socket_unsupported


 if sys.version_info >= (2,3):
@@ -269,8 +281,8 @@ def safename(filename):
    filename = re_slash.sub(",", filename)

    # limit length of filename
-    if len(filename)>64:
-        filename=filename[:64]
+    if len(filename)>200:
+        filename=filename[:200]
    return ",".join((filename, filemd5))

 NORMALIZE_SPACE = re.compile(r'(?:\r\n)?[ \t]+')
@@ -1066,7 +1078,7 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
                        raise CertificateHostnameMismatch(
                            'Server presented certificate that does not match '
                            'host %s: %s' % (hostname, cert), hostname, cert)
-            except ssl_SSLError, e:
+            except (ssl_SSLError, ssl_CertificateError, CertificateHostnameMismatch), e:
                if sock:
                    sock.close()
                if self.sock:
@@ -1076,7 +1088,7 @@ class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
                # to get at more detailed error information, in particular
                # whether the error is due to certificate validation or
                # something else (such as SSL protocol mismatch).
-                if e.errno == ssl.SSL_ERROR_SSL:
+                if getattr(e, 'errno', None) == ssl.SSL_ERROR_SSL:
                    raise SSLHandshakeError(e)
                else:
                    raise
@@ -1155,18 +1167,11 @@ try:
              server_software.startswith('Development/')):
        raise NotRunningAppEngineEnvironment()

-    try:
-        from google.appengine.api import apiproxy_stub_map
-        if apiproxy_stub_map.apiproxy.GetStub('urlfetch') is None:
-            raise ImportError  # Bail out; we're not actually running on App Engine.
-        from google.appengine.api.urlfetch import fetch
-        from google.appengine.api.urlfetch import InvalidURLError
-    except (ImportError, AttributeError):
-        from google3.apphosting.api import apiproxy_stub_map
-        if apiproxy_stub_map.apiproxy.GetStub('urlfetch') is None:
-            raise ImportError  # Bail out; we're not actually running on App Engine.
-        from google3.apphosting.api.urlfetch import fetch
-        from google3.apphosting.api.urlfetch import InvalidURLError
+    from google.appengine.api import apiproxy_stub_map
+    if apiproxy_stub_map.apiproxy.GetStub('urlfetch') is None:
+        raise ImportError  # Bail out; we're not actually running on App Engine.
+    from google.appengine.api.urlfetch import fetch
+    from google.appengine.api.urlfetch import InvalidURLError

    # Update the connection classes to use the Googel App Engine specific ones.
    SCHEME_TO_CONNECTION = {
--- a/src/oauth2client/client.py
+++ b/src/oauth2client/client.py
@@ -1771,7 +1771,7 @@ class DeviceFlowInfo(collections.namedtuple('DeviceFlowInfo', (
 def _oauth2_web_server_flow_params(kwargs):
    """Configures redirect URI parameters for OAuth2WebServerFlow."""
    params = {
-        'access_type': 'offline',
+#        'access_type': 'offline',
        'response_type': 'code',
    }

--- a/src/project-apis.txt
+++ b/src/project-apis.txt
@@ -8,4 +8,5 @@ gmail.googleapis.com
 groupssettings.googleapis.com
 licensing.googleapis.com
 plus.googleapis.com
+reseller.googleapis.com
 siteverification.googleapis.com
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,9 +1,9 @@
-from var import GM_Globals, GM_WINDOWS, GM_SYS_ENCODING
 import collections
 import re
 import sys
 from htmlentitydefs import name2codepoint
 from HTMLParser import HTMLParser
+from var import GM_Globals, GM_WINDOWS, GM_SYS_ENCODING

 def convertUTF8(data):
  if isinstance(data, str):
--- a/src/var.py
+++ b/src/var.py
@@ -4,18 +4,21 @@ import platform
 import re

 gam_author = u'Jay Lee <jay0lee@gmail.com>'
-gam_version = u'4.1'
+gam_version = u'4.22'
 gam_license = u'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'

-GAM_URL = u'http://git.io/gam'
+GAM_URL = u'https://git.io/gam'
 GAM_INFO = u'GAM {0} - {1} / {2} / Python {3}.{4}.{5} {6} / {7} {8} /'.format(gam_version, GAM_URL,
-  gam_author, sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3],
-  platform.platform(), platform.machine())
+                                                                              gam_author,
+                                                                              sys.version_info[0], sys.version_info[1],
+                                                                              sys.version_info[2], sys.version_info[3],
+                                                                              platform.platform(), platform.machine())

 GAM_RELEASES = u'https://github.com/jay0lee/GAM/releases'
 GAM_WIKI = u'https://github.com/jay0lee/GAM/wiki'
 GAM_ALL_RELEASES = u'https://api.github.com/repos/jay0lee/GAM/releases'
 GAM_LATEST_RELEASE = GAM_ALL_RELEASES+u'/latest'
+GAM_PROJECT_APIS = u'https://raw.githubusercontent.com/jay0lee/GAM/master/src/project-apis.txt'

 TRUE = u'true'
 FALSE = u'false'
@@ -41,39 +44,43 @@ FN_OAUTH2_TXT = u'oauth2.txt'
 MY_CUSTOMER = u'my_customer'
 SKUS = {
  u'Google-Apps-For-Business': {
-   u'product': u'Google-Apps', u'aliases': [u'gafb', u'gafw', u'basic', u'gsuite-basic']},
+    u'product': u'Google-Apps', u'aliases': [u'gafb', u'gafw', u'basic', u'gsuitebasic'], u'displayName': u'G Suite Basic'},
  u'Google-Apps-For-Government': {
-   u'product': u'Google-Apps', u'aliases': [u'gafg', u'gsuite-government']},
+    u'product': u'Google-Apps', u'aliases': [u'gafg', u'gsuitegovernment', u'gsuitegov'], u'displayName': u'G Suite Government'},
  u'Google-Apps-For-Postini': {
-   u'product': u'Google-Apps', u'aliases': [u'gams', u'postini', u'gsuite-gams']},
+    u'product': u'Google-Apps', u'aliases': [u'gams', u'postini', u'gsuitegams', u'gsuitepostini', u'gsuitemessagesecurity'], u'displayName': u'G Suite Message Security'},
  u'Google-Apps-Lite': {
-   u'product': u'Google-Apps', u'aliases': [u'gal', u'lite', u'gsuite-lite']},
+    u'product': u'Google-Apps', u'aliases': [u'gal', u'lite', u'gsuitelite'], u'displayName': u'G Suite Lite'},
  u'Google-Apps-Unlimited': {
-   u'product': u'Google-Apps', u'aliases': [u'gau', u'unlimited', u'gsuite-business']},
+    u'product': u'Google-Apps', u'aliases': [u'gau', u'unlimited', u'gsuitebusiness'], u'displayName': u'G Suite Business'},
+  u'1010020020': {
+    u'product': u'Google-Apps', u'aliases': [u'gae', u'enterprise', u'gsuiteenterprise'], u'displayName': u'G Suite Enterprise'},
  u'Google-Drive-storage-20GB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-20gb', u'drive20gb', u'20gb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive20gb', u'20gb', u'googledrivestorage20gb'], u'displayName': u'Google Drive Storage 20GB'},
  u'Google-Drive-storage-50GB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-50gb', u'drive50gb', u'50gb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive50gb', u'50gb', u'googledrivestorage50gb'], u'displayName': u'Google Drive Storage 50GB'},
  u'Google-Drive-storage-200GB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-200gb', u'drive200gb', u'200gb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive200gb', u'200gb', u'googledrivestorage200gb'], u'displayName': u'Google Drive Storage 200GB'},
  u'Google-Drive-storage-400GB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-400gb', u'drive400gb', u'400gb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive400gb', u'400gb', u'googledrivestorage400gb'], u'displayName': u'Google Drive Storage 400GB'},
  u'Google-Drive-storage-1TB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-1tb', u'drive1tb', u'1tb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive1tb', u'1tb', u'googledrivestorage1tb'], u'displayName': u'Google Drive Storage 1TB'},
  u'Google-Drive-storage-2TB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-2tb', u'drive2tb', u'2tb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive2tb', u'2tb', u'googledrivestorage2tb'], u'displayName': u'Google Drive Storage 2TB'},
  u'Google-Drive-storage-4TB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-4tb', u'drive4tb', u'4tb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive4tb', u'4tb', u'googledrivestorage4tb'], u'displayName': u'Google Drive Storage 4TB'},
  u'Google-Drive-storage-8TB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-8tb', u'drive8tb', u'8tb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive8tb', u'8tb', u'googledrivestorage8tb'], u'displayName': u'Google Drive Storage 8TB'},
  u'Google-Drive-storage-16TB': {
-   u'product': u'Google-Drive-storage', u'aliases': [u'drive-16tb', u'drive16tb', u'16tb']},
+    u'product': u'Google-Drive-storage', u'aliases': [u'drive16tb', u'16tb', u'googledrivestorage16tb'], u'displayName': u'Google Drive Storage 16TB'},
  u'Google-Vault': {
-   u'product': u'Google-Vault', u'aliases': [u'vault']},
+    u'product': u'Google-Vault', u'aliases': [u'vault', u'googlevault'], u'displayName': u'Google Vault'},
  u'Google-Vault-Former-Employee': {
-   u'product': u'Google-Vault', u'aliases': [u'vfe']},
+    u'product': u'Google-Vault', u'aliases': [u'vfe', u'googlevaultformeremployee'], u'displayName': u'Google Vault Former Employee'},
  u'Google-Coordinate': {
-   u'product': u'Google-Coordinate', u'aliases': [u'coordinate']}
+    u'product': u'Google-Coordinate', u'aliases': [u'coordinate', u'googlecoordinate'], u'displayName': u'Google Coordinate'},
+  u'Google-Chrome-Device-Management': {
+    u'product': u'Google-Chrome-Device-Management', u'aliases': [u'chrome', u'cdm', u'googlechromedevicemanagement'], u'displayName': u'Google Chrome Device Management'}
  }

 API_VER_MAPPING = {
@@ -84,6 +91,7 @@ API_VER_MAPPING = {
  u'datatransfer': u'datatransfer_v1',
  u'directory': u'directory_v1',
  u'drive': u'v2',
+  u'drive3': u'v3',
  u'email-settings': u'v2',
  u'gmail': u'v1',
  u'groupssettings': u'v1',
@@ -91,6 +99,7 @@ API_VER_MAPPING = {
  u'oauth2': u'v2',
  u'plus': u'v1',
  u'reports': u'reports_v1',
+  u'reseller': u'v1',
  u'siteVerification': u'v1',
  }

@@ -99,15 +108,18 @@ API_SCOPE_MAPPING = {
                    u'https://www.googleapis.com/auth/drive'],
  u'calendar': [u'https://www.googleapis.com/auth/calendar',],
  u'drive': [u'https://www.googleapis.com/auth/drive',],
+  u'drive3': [u'https://www.googleapis.com/auth/drive',],
  u'gmail': [u'https://mail.google.com/',
             u'https://www.googleapis.com/auth/gmail.settings.basic',
             u'https://www.googleapis.com/auth/gmail.settings.sharing',],
  u'plus': [u'https://www.googleapis.com/auth/plus.me',],
 }

-ADDRESS_FIELDS_PRINT_ORDER = [u'contactName', u'organizationName', 
-   u'addressLine1', u'addressLine2', u'addressLine3', u'locality',
-   u'region', u'postalCode', u'countryCode']
+ADDRESS_FIELDS_PRINT_ORDER = [
+  u'contactName', u'organizationName',
+  u'addressLine1', u'addressLine2', u'addressLine3',
+  u'locality', u'region', u'postalCode', u'countryCode',
+  ]

 ADDRESS_FIELDS_ARGUMENT_MAP = {
  u'contact': u'contactName', u'contactname': u'contactName',
@@ -139,7 +151,7 @@ PRINTJOB_DESCENDINGORDER_MAP = {
  u'TITLE': u'TITLE_DESC',
  }

-PRINTJOBS_DEFAULT_JOB_LIMIT = 25
+PRINTJOBS_DEFAULT_JOB_LIMIT = 0
 PRINTJOBS_DEFAULT_MAX_RESULTS = 100

 CALENDAR_REMINDER_METHODS = [u'email', u'sms', u'popup',]
@@ -246,8 +258,11 @@ DRIVEFILE_ORDERBY_CHOICES_MAP = {
  u'viewedbymedate': u'lastViewedByMeDate',
  }

-DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP = {u'delete': u'purging',
-   u'trash': u'trashing', u'untrash': u'untrashing',}
+DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP = {
+  u'delete': u'purging',
+  u'trash': u'trashing',
+  u'untrash': u'untrashing',
+  }

 DRIVEFILE_LABEL_CHOICES_MAP = {
  u'restricted': u'restricted',
@@ -392,8 +407,10 @@ FILTER_CRITERIA_CHOICES_MAP = {
  u'subject': u'subject',
  u'to': u'to',
  }
-FILTER_ACTION_CHOICES = [u'archive', u'forward', u'important', u'label',
-   u'markread', u'neverspam', u'notimportant', u'star', u'trash',]
+FILTER_ACTION_CHOICES = [
+  u'archive', u'forward', u'important', u'label',
+  u'markread', u'neverspam', u'notimportant', u'star', u'trash',
+  ]

 CROS_ARGUMENT_TO_PROPERTY_MAP = {
  u'activetimeranges': [u'activeTimeRanges.activeTime', u'activeTimeRanges.date'],
@@ -425,7 +442,9 @@ CROS_ARGUMENT_TO_PROPERTY_MAP = {
  u'supportenddate': [u'supportEndDate',],
  u'tag': [u'annotatedAssetId',],
  u'timeranges': [u'activeTimeRanges.activeTime', u'activeTimeRanges.date'],
+  u'times': [u'activeTimeRanges.activeTime', u'activeTimeRanges.date'],
  u'user': [u'annotatedUser',],
+  u'users': [u'recentUsers.email', u'recentUsers.type'],
  u'willautorenew': [u'willAutoRenew',],
  }

@@ -454,6 +473,11 @@ CROS_SCALAR_PROPERTY_PRINT_ORDER = [
  u'willAutoRenew',
  ]

+CROS_RECENT_USERS_ARGUMENTS = [u'recentusers', u'users']
+CROS_ACTIVE_TIME_RANGES_ARGUMENTS = [u'timeranges', u'activetimeranges', u'times']
+CROS_START_ARGUMENTS = [u'start', u'startdate', u'oldestdate']
+CROS_END_ARGUMENTS = [u'end', u'enddate']
+
 #
 # Global variables
 #
@@ -486,6 +510,10 @@ GM_MAP_ROLE_ID_TO_NAME = u'ri2n'
 GM_MAP_ROLE_NAME_TO_ID = u'rn2i'
 # Dictionary mapping User ID to Name
 GM_MAP_USER_ID_TO_NAME = u'ui2n'
+# GAM cache directory. If no_cache is True, this variable will be set to None
+GM_CACHE_DIR = u'gacd'
+# Reset GAM cache directory after discovery
+GM_CACHE_DISCOVERY_ONLY = u'gcdo'
 #
 GM_Globals = {
  GM_SYSEXITRC: 0,
@@ -502,6 +530,8 @@ GM_Globals = {
  GM_MAP_ROLE_ID_TO_NAME: None,
  GM_MAP_ROLE_NAME_TO_ID: None,
  GM_MAP_USER_ID_TO_NAME: None,
+  GM_CACHE_DIR: None,
+  GM_CACHE_DISCOVERY_ONLY: True,
  }
 #
 # Global variables defined by environment variables/signal files
@@ -515,6 +545,8 @@ GC_AUTO_BATCH_MIN = u'auto_batch_min'
 GC_BATCH_SIZE = u'batch_size'
 # GAM cache directory. If no_cache is specified, this variable will be set to None
 GC_CACHE_DIR = u'cache_dir'
+# GAM cache discovery only. If no_cache is False, only API discovery calls will be cached
+GC_CACHE_DISCOVERY_ONLY = u'cache_discovery_only'
 # Character set of batch, csv, data files
 GC_CHARSET = u'charset'
 # Path to client_secrets.json
@@ -564,6 +596,7 @@ GC_Defaults = {
  GC_AUTO_BATCH_MIN: 0,
  GC_BATCH_SIZE: 50,
  GC_CACHE_DIR: u'',
+  GC_CACHE_DISCOVERY_ONLY: True,
  GC_CHARSET: DEFAULT_CHARSET,
  GC_CLIENT_SECRETS_JSON: FN_CLIENT_SECRETS_JSON,
  GC_CONFIG_DIR: u'',
@@ -573,16 +606,16 @@ GC_Defaults = {
  GC_DOMAIN: u'',
  GC_DRIVE_DIR: u'',
  GC_DRIVE_MAX_RESULTS: 1000,
-  GC_NO_BROWSER: FALSE,
-  GC_NO_CACHE: FALSE,
-  GC_NO_UPDATE_CHECK: FALSE,
-  GC_NO_VERIFY_SSL: FALSE,
+  GC_NO_BROWSER: False,
+  GC_NO_CACHE: False,
+  GC_NO_UPDATE_CHECK: False,
+  GC_NO_VERIFY_SSL: False,
  GC_NUM_THREADS: 25,
  GC_OAUTH2_TXT: FN_OAUTH2_TXT,
  GC_OAUTH2SERVICE_JSON: FN_OAUTH2SERVICE_JSON,
  GC_SECTION: u'',
  GC_SHOW_COUNTS_MIN: 0,
-  GC_SHOW_GETTINGS: TRUE,
+  GC_SHOW_GETTINGS: True,
  GC_SITE_DIR: u'',
  GC_USER_MAX_RESULTS: 500,
  }
@@ -606,6 +639,7 @@ GC_VAR_INFO = {
  GC_AUTO_BATCH_MIN: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
  GC_BATCH_SIZE: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 1000)},
  GC_CACHE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
+  GC_CACHE_DISCOVERY_ONLY: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
  GC_CHARSET: {GC_VAR_TYPE: GC_TYPE_STRING},
  GC_CLIENT_SECRETS_JSON: {GC_VAR_TYPE: GC_TYPE_FILE},
  GC_CONFIG_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
@@ -663,9 +697,17 @@ MESSAGE_SERVICE_NOT_APPLICABLE = u'Service not applicable for this address: {0}.
 MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON = u'Please run\n\ngam create project\ngam user <user> check serviceaccount\n\nto create and configure a service account.'
 MESSAGE_OAUTH2SERVICE_JSON_INVALID = u'The file {0} is missing required keys (client_email, client_id or private_key). Please remove it and recreate with the commands:\n\ngam create project\ngam user <user> check serviceaccount'
 # oauth errors
-OAUTH2_TOKEN_ERRORS = [u'access_denied', u'unauthorized_client: Unauthorized client or scope in request.', u'access_denied: Requested client not authorized.',
-                       u'invalid_grant: Not a valid email.', u'invalid_grant: Invalid email or User ID', u'invalid_grant: Bad Request',
-                       u'invalid_request: Invalid impersonation prn email address.', u'internal_failure: Backend Error']
+OAUTH2_TOKEN_ERRORS = [
+  u'access_denied',
+  u'access_denied: Requested client not authorized',
+  u'internal_failure: Backend Error',
+  u'invalid_grant: Bad Request',
+  u'invalid_grant: Invalid email or User ID',
+  u'invalid_grant: Not a valid email',
+  u'invalid_request: Invalid impersonation prn email address',
+  u'unauthorized_client: Client is unauthorized to retrieve access tokens using this method',
+  u'unauthorized_client: Unauthorized client or scope in request',
+  ]
 #
 # callGAPI throw reasons
 GAPI_BACKEND_ERROR = u'backendError'
@@ -683,4 +725,3 @@ GAPI_USER_RATE_LIMIT_EXCEEDED = u'userRateLimitExceeded'
 GAPI_DEFAULT_RETRY_REASONS = [GAPI_QUOTA_EXCEEDED, GAPI_RATE_LIMIT_EXCEEDED, GAPI_USER_RATE_LIMIT_EXCEEDED, GAPI_BACKEND_ERROR, GAPI_INTERNAL_ERROR]
 GAPI_GMAIL_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
 GAPI_GPLUS_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
-
--- a/src/whatsnew.txt
+++ b/src/whatsnew.txt
@@ -1,3 +1,36 @@
+GAM 4.22
+ - Validate client id and secret from user input (reduces user errors on create project)
+ - Ross - optimize "gam print printjobs"
+ - Ross- countsonly option for gam print courses
+
+GAM 4.21
+ - Drive v3 fixes/updates by Ross
+ - "gam print crosactivty" command outputs active users and times
+ - SMime and calendar ACL fixes by Ross
+ - standardized cros info/print functionality by Ross
+
+GAM 4.2
+ - Create, Update, Delete and List Team Drives
+ - Start moving to Drive API v3
+ - Disable GAM cache by default to prevent errors (Ross)
+ - Use service accounts for all Calendar, Drive and Gmail operations to reduce scopes
+ - Fix "Unknown" errors due to a scope issue (may require "gam oauth revoke" and re-authentication)
+ - "gam info domain" shows basic user / license sums again
+ - "gam report customer" now shows more browser usage stats
+ - Fix project creation ToS error (Ross)
+
+GAM 4.12
+ - Realtime 2SV user status in gam info user and gam print users. Thanks hajdbo!
+ - Reseller API support. Create and manage customers and subscriptions.
+ - Delete or modify Gmail threads. Improved message delete/modify performance.
+ - Support for the new G Suite Enterprise license
+ - Manage S/MIME certificates for G Suite Enterprise users
+ - Many fixes and improvements by Ross.
+
+GAM 4.11
+ - Allow newlines in calendar event descriptions (Ross)
+ - All HTTP requests should now honor SSL verify setting, debug, etc
+
 GAM 4.1
 - Fix "gam create project"
 - project create cleanups by Ross
--- a/src/windows-build.bat
+++ b/src/windows-build.bat
@@ -5,8 +5,8 @@ rmdir /q /s dist
 del /q /f gam-%1-windows.zip
 del /q /f gam-%1-windows-x64.zip
 del /q /f gam-%1-windows-x64.msi
-del /q /f gam.wixobj
-del /q /f gam.wixpdb
+del /q /f *.wixobj
+del /q /f *.wixpdb

 c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
 xcopy LICENSE gam\
@@ -25,4 +25,5 @@ xcopy GamCommands.txt gam-64\

 set GAMVERSION=%1
 "%ProgramFiles(x86)%\WiX Toolset v3.10\bin\candle.exe" -arch x64 gam.wxs
-"%ProgramFiles(x86)%\WiX Toolset v3.10\bin\light.exe" -ext "%ProgramFiles(x86)%\WiX Toolset v3.10\bin\WixUIExtension.dll" gam.wixobj -o gam-%1-windows-x64.msi
+"%ProgramFiles(x86)%\WiX Toolset v3.10\bin\light.exe" -ext "%ProgramFiles(x86)%\WiX Toolset v3.10\bin\WixUIExtension.dll" gam.wixobj -o gam-%1-windows-x64.msi
+del /q /f gam-%1-windows-x64.wixpdb
Author	SHA1	Message	Date
Ross Scroggs	4998c30d20	Update create/update group, use update semantics (#501 )	2017-05-22 19:43:58 -04:00
Ross Scroggs	20e84b9c9a	On create group, use Group Settings to set description with new lines (#500 )	2017-05-20 17:33:57 -04:00
Jay Lee	efdaa6a64e	Update README.md	2017-05-20 16:14:59 -04:00
Ross Scroggs	1a96622366	Update calendar to allow access to user's secondary calendars (#499 ) * Update calendar to allow access to user's secondary calendars * Code cleanup * Code cleanup * Code cleanup	2017-05-20 15:34:25 -04:00
Jay Lee	d5af189125	Report Basic/Business/Enterprise user and license counts in gam info domain Note that there is currently an error on Google's side where license count sometimes incorrectly reports user count instead of total licenses shown in the admin console, Google is aware of the issue and should be fixing at some point.	2017-05-20 12:47:13 -04:00
Ross Scroggs	5ebaf8264a	Alphabetize scopes for easier reading (#498 )	2017-05-20 12:33:02 -04:00
Ross Scroggs	40bfde9697	Fix indentation in doCreateProject; fix typo in gam-install.sh (#496 )	2017-05-15 14:14:22 -04:00
Jay Lee	a52805b35e	Fix Cloud Org ACLs when possible	2017-05-13 15:23:53 -04:00
Jay Lee	0312258db7	Check if token exists before delete so GAM output is accurate	2017-05-08 12:46:24 -04:00
Ross Scroggs	2ddd9e2477	Fix gam csv/Unicode issues on Windows (#492 )	2017-04-26 16:10:57 -04:00
Ross Scroggs	be44d2c601	Implement _getValueFromOauth (#491 )	2017-04-26 13:34:52 -04:00
Jay Lee	ee44ba67cf	Update gam-install.sh	2017-04-24 13:00:16 -04:00
Jay Lee	c462216be7	Update gam-install.sh	2017-04-24 12:45:06 -04:00
Jay Lee	e43ebd4d40	Update gam-install.sh	2017-04-24 12:38:35 -04:00
Jay Lee	0ea0c416ec	Default to 0 (no limit) print jobs	2017-04-21 13:36:24 -04:00
Ross Scroggs	3f42eb86d2	Fix typo (#482 )	2017-04-17 18:54:14 -04:00
Jay Lee	b003e5065a	Merge branch 'master' of https://github.com/jay0lee/GAM	2017-04-17 10:42:19 -04:00
Jay Lee	cc25c40406	strip whitespace from beginning and end of client id/secret	2017-04-17 10:42:11 -04:00
Ross Scroggs	8e3c632a7c	Handle new OAuth2 Token error, ignore periods in messages (#481 ) * Handle new OAuth2 Token error, ignore periods in messages * Fix typo	2017-04-17 10:35:03 -04:00
Ross Scroggs	ab94208bb5	Use update instead of patch for update user (#480 ) This is required in order for update user phones/orgamizations/addresses/... clear to work	2017-04-16 15:14:17 -04:00
Jay Lee	0562ed3eb9	GAM 4.22	2017-04-16 13:21:38 -04:00
Ross Scroggs	3ceef052a3	Optimize print job downloads (#476 )	2017-04-16 13:11:36 -04:00
Jay Lee	d5b5251587	error out instead of creating new projects with unused file names.	2017-04-16 13:10:35 -04:00
Jay Lee	0ae73fa6b3	Implement checks for valid client id and secret	2017-04-07 21:37:43 -04:00
Ross Scroggs	38b6fd213f	Add countsonly option to gam print courses to get student/teacher counts without full profiles (#473 ) * Add countsonly option to gam print courses * When countsonly is true, only get ids, not full profile * Update documentation	2017-04-03 15:21:00 -04:00
Ross Scroggs	39193ae92f	Add debugging to print printjobs, add additional termination check (#472 )	2017-04-03 13:31:58 -04:00
Jay Lee	c8c18497cc	cleanup wixpdb files	2017-04-01 13:14:05 -04:00
Jay Lee	bdb0b3d6dc	GAM 4.21	2017-04-01 12:53:11 -04:00
Ross Scroggs	7312c8f396	Standardize info cros/print cros/print crosactivity (#470 )	2017-04-01 12:05:15 -04:00
Jay Lee	831272a137	Revert "Standardize info cros/print cros/print crosactivity (#468 )" (#469 ) This reverts commit `d50231b888`.	2017-04-01 10:30:29 -04:00
Ross Scroggs	d50231b888	Standardize info cros/print cros/print crosactivity (#468 ) * Standardize info cros/print cros/print crosactivity * Move _filterTimeRanges before 1st function that uses it.	2017-04-01 10:25:20 -04:00
Ross Scroggs	6160bb0953	Fix calendar add ACL (#465 )	2017-03-31 13:27:49 -04:00
Ross Scroggs	1e013e6cd7	Fix add smime, isDefault can not be set on insert (#458 ) * Update print drive settings to reflect change to Drive v3 * removeExpiration not passed to API * Update documentation * organizer is valid role on update drivefileacl * Fix add smime, isDefault can not be set on insert	2017-03-31 13:02:34 -04:00
Jay Lee	96955d9305	Merge branch 'master' of https://github.com/jay0lee/GAM	2017-03-27 11:39:49 -04:00
Jay Lee	fdfa38a209	gam print crosactivity	2017-03-27 11:39:26 -04:00
Ross Scroggs	daa4b57af1	Drive v3 related changes (#456 ) * Update print drive settings to reflect change to Drive v3 * removeExpiration not passed to API * Update documentation * organizer is valid role on update drivefileacl	2017-03-24 15:25:24 -04:00
Ross Scroggs	de3be6ba52	Update documentation (#454 ) * Fix create project to handle Google change * Handle newlines in app name Don’t output name/value for name == u'accounts:authorized_apps’, apps are listed later * Cleanup My typos: 614, 813 Pylint: 887, 3618/4184, 8657, 8751 Your typo: 6794 * Update documentation	2017-03-22 22:05:57 -04:00
Ross Scroggs	81c2e425ef	Clean up (#453 ) * Fix create project to handle Google change * Handle newlines in app name Don’t output name/value for name == u'accounts:authorized_apps’, apps are listed later * Cleanup My typos: 614, 813 Pylint: 887, 3618/4184, 8657, 8751 Your typo: 6794	2017-03-22 20:39:44 -04:00
Jay Lee	4bf6b6fb96	What's new in 4.2	2017-03-22 16:56:37 -04:00
Ross Scroggs	4ed8497bd7	Minor fixes to showReport (#452 ) * Fix create project to handle Google change * Handle newlines in app name Don’t output name/value for name == u'accounts:authorized_apps’, apps are listed later	2017-03-22 15:45:20 -04:00
Ross Scroggs	738280bbe5	Fix create project to handle Google change (#451 )	2017-03-22 14:33:27 -04:00
Jay Lee	ad9384aeac	Soft errors on team drive functions	2017-03-22 13:59:38 -04:00
Jay Lee	67f5416858	Team Drive CSV and screen output	2017-03-22 13:34:28 -04:00
Jay Lee	51567ff5c4	fix report users, include msgValue items in report customer	2017-03-22 12:52:10 -04:00
Ross Scroggs	6f6a94c9b0	Handle bad data from Google in gam report customer (#450 )	2017-03-22 11:12:22 -04:00
Jay Lee	08bd3ecc91	Get 4.2 ready	2017-03-19 14:06:17 -04:00
Jay Lee	6ebc0f4e81	Moar v3, Moar Team Drive	2017-03-19 14:05:46 -04:00
Jay Lee	bf39798263	Update Drive ACLs to v3	2017-03-18 21:07:51 -04:00
Jay Lee	92521acfa3	More v3 work	2017-03-18 20:36:45 -04:00
Jay Lee	f8d43a19c1	User counts for gam info domain	2017-03-18 13:32:48 -04:00
Jay Lee	842ddc2a26	httplib 0.10.3, api-client 1.6.2	2017-03-18 12:17:19 -04:00
Jay Lee	bafed078e5	Fix report name for todrive	2017-03-17 22:07:41 -04:00
Jay Lee	8999fb84de	Switch report uploads to use SA, remove Drive scope	2017-03-17 20:05:06 -04:00
Jay Lee	3b162924c5	back to email scope, use SA for all Gmail API calls	2017-03-17 19:26:16 -04:00
Jay Lee	242c61205d	Switch Calendar to use SA only	2017-03-17 12:57:31 -04:00
Jay Lee	139727dd33	Use service accounts for Calendar ACLs	2017-03-17 12:39:17 -04:00
Ross Scroggs	a52341e29e	Improve API caching options, cache errors (#446 ) * Improve API caching options, cache errors * Clarify argument names * All or nothing caching I changed the argument names and implemented your proposal: nocache.txt: ignored allcache.txt present: all caching default: no caching	2017-03-16 11:23:42 -04:00
Jay Lee	c2358f60fb	More Team Drive Work	2017-03-16 06:23:12 -04:00
Jay Lee	c8ea108be3	Use https://git.io/gam	2017-03-15 19:40:17 -04:00
Jay Lee	8fdd0abc53	scopes for drive3	2017-03-15 16:46:52 -04:00
Jay Lee	f396b2f476	Create Team Drives, show permissions and info	2017-03-15 16:07:40 -04:00
Jay Lee	6e9413eada	drive3 API for Drive v3 API	2017-03-15 15:04:46 -04:00
Ross Scroggs	30a5467b82	Optimize License handling (#440 ) * Handle batch file errors, clean up commit-batch messages * Optimize License handling	2017-03-15 14:57:56 -04:00
Jay Lee	3ffa3ca5e5	If we can't get a safe filename, name the file after it's ID	2017-02-21 15:03:45 -05:00
Ross Scroggs	f0351b8bec	Handle batch file errors, clean up commit-batch messages (#439 )	2017-02-21 13:57:55 -05:00
Jay Lee	d8093fa1f0	Merge branch 'master' of https://github.com/jay0lee/GAM	2017-02-19 15:54:50 -05:00
Jay Lee	2080f33fdb	What's new in 4.12	2017-02-19 15:54:27 -05:00
Ross Scroggs	6a2925c546	pool.join required to wait for processes to finish (#436 )	2017-02-19 10:53:42 -05:00
Jay Lee	26960c96d9	Improve batch to handle CTRL+C and print status	2017-02-19 08:49:31 -05:00
Jay Lee	58a080fe6b	4.12, delete message fix	2017-02-18 17:20:49 -05:00
Ross Scroggs	3c3b7527a1	Clean up SKU handling (#432 )	2017-02-18 16:57:42 -05:00
Jay Lee	0d7028416a	Reduce key size	2017-02-13 10:26:25 -05:00
Ross Scroggs	aa6dca4b4c	Keep the pylint wolf at bay (#430 ) * Fix bug, update ducumantation * Clean up error messages * Exit on error, fix bug * One more bug fix * Update documentation, fix code l_sku can never match a_sku.lower() because it has -'s stripped and a_sku doesn't * Keep the pylint wolf at bay * Clean up code, avoid try/except	2017-02-11 08:31:34 -05:00
Ross Scroggs	3d7a7bd609	Update documentation, fix code (#429 ) l_sku can never match a_sku.lower() because it has -'s stripped and a_sku doesn't	2017-02-10 22:00:32 -05:00
Jay Lee	35854af1e9	Improve handling and display of licenses - displayName added so what admin sees better matches admin console - better aliases for each skuId - admin can specify exact productId they wanted (would have solved renaming of Enterprise SKU issue)	2017-02-09 09:35:54 -05:00
Jay Lee	4450652c32	Google Changed SKU for Enterprise license :-(	2017-02-08 14:44:02 -05:00
Ross Scroggs	d34e09f8d5	One more bug fix (#426 ) * Fix bug, update ducumantation * Clean up error messages * Exit on error, fix bug * One more bug fix	2017-02-07 12:33:25 -05:00
Ross Scroggs	610ba5bf6a	Exit on error, fix bug (#425 ) * Fix bug, update ducumantation * Clean up error messages * Exit on error, fix bug	2017-02-07 11:53:59 -05:00
Ross Scroggs	65debc6a27	Clean up error messages (#424 ) * Fix bug, update ducumantation * Clean up error messages	2017-02-07 11:18:31 -05:00
Ross Scroggs	61868d5fde	Fix bug, update ducumantation (#423 )	2017-02-07 11:01:59 -05:00
Ross Scroggs	998f4c6dff	Make reseller commands consistent (#422 )	2017-02-07 10:44:26 -05:00
Ross Scroggs	a2a8393775	Fix bugs (#421 )	2017-02-07 09:43:51 -05:00
Jay Lee	d9ec9d3af9	Merge branch 'master' of https://github.com/jay0lee/GAM	2017-02-04 14:59:07 -05:00
Jay Lee	7104b24633	more work on Reseller API	2017-02-04 14:57:42 -05:00
Ross Scroggs	9cd81c9148	Use different index for inner loop (#419 )	2017-02-03 19:42:59 -05:00
Ross Scroggs	56a60d1651	Fix add/update/delete smime when sendas argument not specified (#418 ) * Simplify by using existing function * add/update smime using 1st users email address when sendas not specified * Fix error messages, update documentation * Delete smile needs same fix * Delete/update have same problem with smimeId * Clean up names * Missed one	2017-02-03 18:27:55 -05:00
Ross Scroggs	1cdf02bc31	Simplify by using existing function (#417 )	2017-02-03 15:50:34 -05:00
Jay Lee	5b469496d6	Initial S/MIME support (requires Enterprise SKU)	2017-02-03 13:29:36 -05:00
Ross Scroggs	2a1d3a1ce1	Default encoding has to be set on multiprocess instances of gam (#416 ) * Default encoding has to be set on multiprocess instances of gam * Update documentation	2017-02-03 13:02:31 -05:00
Boris Hajduk	9b89492d83	We can now query 2SV status in the print users command (#415 )	2017-02-03 11:35:52 -05:00
Boris Hajduk	45b1eee8f3	early support to get info user info about 2-step verification enrollment (#414 )	2017-02-03 11:08:45 -05:00
Jay Lee	e9dda2079a	Add reseller API to projects to enable	2017-02-01 10:27:13 -05:00
Ross Scroggs	c279acbab8	Enhance print courses/course-participants (#413 )	2017-02-01 09:09:02 -05:00
Jay Lee	082cd9b087	First commit of Reseller API support	2017-01-31 16:06:32 -05:00
Ross Scroggs	7d2e5d674a	Handle user error in update labels (#412 ) * Get only required fields when processing messages * Handle customer id in group add/delete/sync/clear I always wondered what this was: if user_email != u'' Allow * to mean all users in group operations * Make pylon happy, handle user error in update labels	2017-01-31 15:48:47 -05:00
Ross Scroggs	b2d95c545d	Handle customer id in group add/delete/sync/clear  (#411 ) * Get only required fields when processing messages * Handle customer id in group add/delete/sync/clear I always wondered what this was: if user_email != u'' Allow * to mean all users in group operations	2017-01-31 14:52:21 -05:00
Ross Scroggs	127c3125ad	Get only required fields when processing messages (#410 )	2017-01-31 13:27:11 -05:00
Jay Lee	63f1e0d504	Merge branch 'master' of https://github.com/jay0lee/GAM	2017-01-31 12:53:32 -05:00
Jay Lee	1ad10b6954	G Suite Enterprise SKU	2017-01-31 12:53:00 -05:00
Ross Scroggs	820cf98087	Fix typos in new messages/threads command parsing (#407 ) * Soft error when getting group members, fix typo * Fix typos	2017-01-27 14:54:12 -05:00
Jay Lee	15bd6beebd	Threads and batch support for Gmail modify/delete	2017-01-27 11:03:25 -05:00
Ross Scroggs	31871f192c	gam group <GroupName> should only return users except when updating groups (#406 )	2017-01-26 15:18:34 -05:00
Ross Scroggs	7acfa4a2ac	Handle newlines in various description fields (#405 )	2017-01-26 14:34:46 -05:00
Ross Scroggs	e212d68d60	Move project-apis.txt URL to var.py so all urls are in same spot (#403 )	2017-01-26 13:27:22 -05:00
Ross Scroggs	6aeee89ee4	Handle group members of type CUSTOMER (#402 )	2017-01-26 13:06:15 -05:00
Ross Scroggs	623572a652	Soft error when getting group members, fix typo (#401 )	2017-01-26 11:07:20 -05:00
Jay Lee	f7c587c08b	no argument to -l	2017-01-25 15:30:33 -05:00
Jay Lee	da1f346b1a	-l argument to bash script for upgrade only	2017-01-25 15:27:12 -05:00
Jay Lee	056b56ed78	GAM 4.11 part 2	2017-01-25 14:31:20 -05:00
Jay Lee	791581b850	GAM 4.11	2017-01-25 14:29:36 -05:00
Ross Scroggs	08f426ba09	Allow suppression of empty entries in multivalued schema fields (#399 )	2017-01-25 14:21:58 -05:00
Jay Lee	54371cffff	remove .apps.googleusercontent.com from client id for auth	2017-01-25 11:35:33 -05:00
Jay Lee	c7946c0edf	remove access_type=offline to shorten auth URLs as it's default already	2017-01-25 11:22:25 -05:00
Jay Lee	ae578c64a0	rename to simplehttp so we don't affect http	2017-01-25 09:02:11 -05:00
Jay Lee	08bc1898cc	fix splitlines	2017-01-25 08:57:23 -05:00
Jay Lee	dc626b1b3e	always use httplib2 so we are consistent with TLS verify, debug output, etc	2017-01-25 08:53:33 -05:00
Ross Scroggs	7283e06750	Allow newlines in calendar event descriptions. (#398 )	2017-01-24 15:36:12 -05:00