Ross Scroggs
bcb17cd0a5
in doRequestOauth, initialize API use_scopes from gamscopes.json if available
2016-01-01 07:40:22 -08:00
Ross Scroggs
1ec164a25a
Bring gam oauth delete back, give creation message
2016-01-01 06:50:16 -08:00
Ross Scroggs
571a9dcb3e
Handle no scopes for API
...
This should probably call doRequestOAuth rather than bailing out
2015-12-31 23:37:15 -08:00
Ross Scroggs
a0ac6265e9
If SetGlobalVariables calls doRequestOAuth, don't call again if command is oauth create
2015-12-31 23:18:44 -08:00
Ross Scroggs
ea6f49f7be
Have OAuthInfo print API scope table
2015-12-31 22:54:07 -08:00
Ross Scroggs
0470680a4d
Add some error checking for gamscopes.json
2015-12-31 20:43:33 -08:00
Ross Scroggs
e0c52c8660
First cut, dynamic scopes
...
Environment variable GAMSCOPESFILE points to scopes file.
Scopes file gamscopes.json
2015-12-31 20:20:38 -08:00
Ross Scroggs
3182ce031c
Leave email scope in tryOAuth
2015-12-31 18:00:29 -08:00
Ross Scroggs
f6dd0ccd12
Cleanup doRequestOAuth
...
admin_email isn't used; If it's going to be used I'd say:
`
if GC-Values{GC_ADMIN):
admin_email = GC_Values[GC_ADMIN]
else:
admin_email = raw_input(u'Please enter your admin email address: ')
`
'oauth2' isn't in API_VER_MAPPING so the remove fails. If it might go
back in but you don't want it here, say:
`
if u'oauth2' in apis:
apis.remove(u'oauth2')
`
2015-12-31 17:30:39 -08:00
Ross Scroggs
775b0c8c60
Merge remote-tracking branch 'jay0lee/master'
2015-12-31 16:43:57 -08:00
Jay Lee
1c4424dd0b
Get doRequestOAuth to actually print out list of scopes
2015-12-31 16:47:53 -05:00
Jay Lee
8501aec7bc
gdata discovery file description updates
2015-12-31 12:47:03 -05:00
Jay Lee
05a36d3245
update Google OAuth URIs
...
upstream pull request is:
https://github.com/google/oauth2client/pull/368
2015-12-31 12:44:40 -05:00
Ross Scroggs
2bf8f9164e
Fix typo, drop unneeded API from table
2015-12-31 08:59:38 -08:00
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