Jay Lee
df0bcda952
Merge pull request #157 from taers232c/master
...
no_browser.txt still needed by output_csv
2015-12-30 13:28:49 -05:00
Jay Lee
d871378336
dynamically get API scopes for "gam oauth request"
2015-12-30 13:25:06 -05:00
Ross Scroggs
f99add7a3f
no_browser.txt still needed by output_csv
2015-12-30 10:20:18 -08:00
Jay Lee
7515700b1a
fix GC_Defaults dict init
2015-12-30 13:18:56 -05:00
Ross Scroggs
99db4d50d3
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 10:06:41 -08:00
Jay Lee
0cd8246bdb
remove unused G+ APIs
2015-12-30 12:58:21 -05:00
Ross Scroggs
29ee81ef18
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 09:57:46 -08:00
Jay Lee
9e09c06770
gdata scopes as globals
2015-12-30 12:57:42 -05:00
Jay Lee
65603ca314
Merge pull request #156 from taers232c/master
...
Use GAM_ADMIN environment variable as short-term fix to hardcoded value
2015-12-30 12:56:50 -05:00
Ross Scroggs
a983d23f91
Define GAM_ADMIN environment variable
2015-12-30 09:52:18 -08:00
Ross Scroggs
3545306559
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 09:23:02 -08:00
Jay Lee
08163cc5cd
remove some legacy variables
2015-12-30 12:13:57 -05:00
Jay Lee
c629c3424c
TODOs for a few ugly hard coded hacks
2015-12-30 12:08:37 -05:00
Jay Lee
ef403119d9
Intial steps to switch to 100% service accounts
...
Still need to store admin email and granted scopes in a file as well as
build these on first run.
2015-12-30 11:30:03 -05:00
Ross Scroggs
798c126881
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 06:43:08 -08:00
Jay Lee
813d503bb8
use object already avail instead of buildDiscoveryObject()
2015-12-30 09:15:34 -05:00
Jay Lee
7e71a06c5f
Merge pull request #155 from taers232c/master
...
Cleanup and gam csv optimization
2015-12-30 09:02:20 -05:00
Ross Scroggs
68475a00c1
Merge remote-tracking branch 'origin/master'
2015-12-26 08:46:48 -08:00
Ross Scroggs
4d71b6943c
Clean up, gam csv optimization
...
showCalSettings had nested loop over user
doLabel cleaned up, has starting point for parsing arguments passed in
from main
doUpdateUser has starting point for parsing arguments passed in from
main
gam csv processing is optimized. All '~~xxx~~' and '~xxx' substitutions
are found for each argument and loaded into a dictionary once before
the loop. During the loop, the substitutions can be performed quickly.
2015-12-26 08:46:42 -08:00
Ross Scroggs
42caddb8a3
Merge remote-tracking branch 'jay0lee/master'
2015-12-25 05:50:03 -08:00
Ross Scroggs
52d8604099
Merge remote-tracking branch 'jay0lee/master'
2015-12-25 05:48:41 -08:00
Jay Lee
2df3aef52d
more fixes to doVacation
2015-12-25 05:42:47 -05:00
Jay Lee
9773e25932
Merge pull request #154 from taers232c/master
...
Fix doVacation bug
2015-12-25 05:37:45 -05:00
Ross Scroggs
cd766d90e4
Fix doVacation problem
2015-12-24 23:04:40 -08:00
Ross Scroggs
8f69fc84a8
Merge remote-tracking branch 'jay0lee/master'
2015-12-23 12:49:36 -08:00
Jay Lee
a8f0882220
Merge pull request #153 from taers232c/master
...
Cleanup argument passing to callGAPI, callGAPIpages, callGData
2015-12-23 15:48:22 -05:00
Ross Scroggs
d79c28d2d3
Eliminate unneeded service=, function=, items= in calls to API functions
...
Saves 5.5kb!
2015-12-23 11:07:08 -08:00
Ross Scroggs
ba756d12b2
Merge remote-tracking branch 'jay0lee/master'
2015-12-23 08:15:34 -08:00
Jay Lee
48e6872233
Merge pull request #150 from taers232c/master
...
Debugging only incompatible with gam batch - and gam csv -
2015-12-23 11:08:04 -05:00
Ross Scroggs
5037a9bbfd
Debugging only incompatible with gam batch - and gam csv -
2015-12-23 07:35:36 -08:00
Jay Lee
3fcde95fe8
Add "gam print roles"
2015-12-23 09:52:04 -05:00
Ross Scroggs
a58e5e4276
Merge remote-tracking branch 'jay0lee/master'
2015-12-23 06:42:45 -08:00
Jay Lee
2235c10df7
handle blank lines it batch
2015-12-23 09:05:03 -05:00
Jay Lee
327e09291b
disable discovery cache
...
Disable discovery cache as it broke CSV commands on windows with lock
errors. The cache is new in googleapiclient 1.4.2 which was upgraded
after GAM 3.61:
30125120b4
2015-12-23 08:06:22 -05:00
Jay Lee
1dd36424be
showLabels handle non-Gmail users
2015-12-23 06:55:22 -05:00
Jay Lee
ade2d0ae54
handle no results on Gmail profile
2015-12-23 06:50:57 -05:00
Jay Lee
ac3dbd25f3
If userid isn't in domain, return blank
2015-12-23 06:32:43 -05:00
Jay Lee
2e6811d2d4
Limit cache filenames to 64 chars to prevent long paths from confusing windows
2015-12-23 06:26:45 -05:00
Jay Lee
61a9d0c0a6
Merge pull request #146 from taers232c/master
...
Global variables update
2015-12-23 06:18:36 -05:00
Ross Scroggs
4cc775bcae
Eliminate try except IndexError in argument parsing
2015-12-22 23:27:42 -08:00
Ross Scroggs
96dfa52dba
Clean up parsing transferSecCals, transferDriveFiles
2015-12-22 22:16:33 -08:00
Ross Scroggs
1f1329c536
Ok, allow gam create admin to take uid: or id:abcdefghi for org unit
2015-12-22 20:41:13 -08:00
Ross Scroggs
3bb54f875d
In gam create admin, org unit id is id:abcdefghj not uid:abcdefhgi
2015-12-22 20:34:42 -08:00
Ross Scroggs
84b6c1cb87
Handle undefined role
2015-12-22 18:15:15 -08:00
Ross Scroggs
4f4bb316d0
Handle invalid argument in gam print admins
2015-12-22 18:09:22 -08:00
Ross Scroggs
fe6430edc6
Global variables do-over
...
Global variables not from environment variables/signal files in
GM_Globals
Global variables from environment variables/signal files in GC_Values
SetGlobalVariables processes all environment variables/signal files
buildGAPIObject reworked
buildGAPIServiceObject reworked
Switch resource calendar processing from GData to GAPI
Implement role assignments
2015-12-22 17:56:37 -08:00
Ross Scroggs
6c421de8c4
Merge remote-tracking branch 'jay0lee/master'
2015-12-22 17:52:31 -08:00
Ross Scroggs
c04ae91dc5
Commit Jay changes
2015-12-22 17:37:56 -08:00
Ross Scroggs
14bc340e56
Commit Jays changes
2015-12-22 17:23:43 -08:00
Ross Scroggs
6fd107c230
CSV debug check inadvertently dropped
2015-12-22 16:39:56 -08:00
