Ross Scroggs
56732ea3e8
Commit Jay's changes
2015-12-31 08:18:28 -08:00
Ross Scroggs
7a4b32aadb
Merge remote-tracking branch 'jay0lee/master'
...
# Conflicts:
# src/gam.py
2015-12-31 08:10:35 -08:00
Jay Lee
16add1bf24
UBER_SCOPE for appsactivity-v1 API
2015-12-31 09:34:03 -05:00
Jay Lee
433cdfe87d
define UBER_SCOPES to cut down on unnecessary scope overlap
2015-12-31 08:57:16 -05:00
Jay Lee
a3d0a0250a
Remove usage of oauth2 API for now as it's nearly useless
2015-12-31 08:52:05 -05:00
Ross Scroggs
b037333d2b
Clean up OAuthInfo
2015-12-31 01:01:05 -08:00
Ross Scroggs
bf6c2ef266
buildGAPIObject reworked
...
This gets everything working but does not address the issue of matching
the admins actual scope list.
You'd better define GA_DOMAIN as it used to come out of oauth2.txt if
it wasn't defined.
I had to add Audit API and Site Verification API to the service account
list of APIs and downloaded a new oauth2service.json.
2015-12-30 23:39:04 -08:00
Ross Scroggs
abde922b49
Only build object if necessary
2015-12-30 15:38:39 -08:00
Ross Scroggs
eca89ca5e9
Fix typo
2015-12-30 15:17:43 -08:00
Ross Scroggs
a91c987107
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 14:49:32 -08:00
Jay Lee
12166e2245
more work on dynamic scope selections
2015-12-30 17:10:06 -05:00
Ross Scroggs
e612c20141
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 13:44:32 -08:00
Jay Lee
d2039e5566
cleanup admin settings API name
2015-12-30 16:24:37 -05:00
Jay Lee
20bba75e41
default scope selections
...
basic logic is:
-if 1 scope for API, use it
-skip over scopes ending in .readonly, .action or .verify_only UNLESS
all scopes are readonly, use all scopes (this is case with reports api)
-all other scopes are used by default.
2015-12-30 16:12:49 -05:00
Ross Scroggs
2d26b647c8
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 12:54:40 -08:00
Ross Scroggs
ab0bec7a7b
Merge remote-tracking branch 'jay0lee/master'
...
# Conflicts:
# src/gam.py
2015-12-30 12:54:35 -08:00
Jay Lee
b6c5f1b1e7
gdata discovery files wrap into Windows build
2015-12-30 15:39:40 -05:00
Jay Lee
881cc4d255
redo of Ross' latest patch against my updates
2015-12-30 15:36:24 -05:00
Jay Lee
3d61973071
discovery files for 2 other gdata apis to standardize scope discovery
2015-12-30 15:30:58 -05:00
Ross Scroggs
5ae1f3c441
Cleanup
2015-12-30 11:50:17 -08:00
Ross Scroggs
6ae4cf495d
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 11:39:07 -08:00
Jay Lee
900fc9c4e3
sanitize some defaults
2015-12-30 14:22:33 -05:00
Ross Scroggs
0207e84551
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 11:11:11 -08:00
Jay Lee
3a2d663c86
Merge pull request #158 from taers232c/master
...
Fix typo, delete call to obsolete function
2015-12-30 14:10:25 -05:00
Ross Scroggs
7aaaaf9125
Fix type, delete obsolete function
2015-12-30 10:59:04 -08:00
Ross Scroggs
e051b9bffa
Merge remote-tracking branch 'jay0lee/master'
2015-12-30 10:32:09 -08:00
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
