Skip to content

Commit c47fab7

Browse files
jcgregoriojcgregorio
committed
Add oauth2client as a completely separate library.
Reviewed in http://codereview.appspot.com/4630079/
1 parent 9c8588a commit c47fab7

11 files changed

Lines changed: 156 additions & 57 deletions

File tree

‎MANIFEST_oauth2client.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
recursive-include httplib2 *.py
2+
recursive-include simplejson *.py *.c
3+
recursive-include samples *.py *.png *.html *.yaml *.json
4+
include setup_utils.py
5+
include gflags.py
6+
include gflags_validators.py
7+
include README

‎Makefile‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,32 @@ release: prerelease
3030
wget "http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py" -O googlecode_upload.py
3131
python googlecode_upload.py --summary="Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.tar.gz
3232
python googlecode_upload.py --summary="Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.zip
33+
34+
35+
.PHONY: oauth2_prerelease
36+
oauth2_prerelease:
37+
-sudo rm -rf dist/
38+
-sudo rm -rf snapshot/
39+
mkdir snapshot
40+
python expand-symlinks.py --source=oauth2client --dest=snapshot/oauth2client
41+
python expand-symlinks.py --source=samples/oauth2/dailymotion --dest=snapshot/samples/dailymotion
42+
python expand-symlinks.py --source=samples/appengine_with_decorator --dest=snapshot/samples/appengine_with_decorator
43+
python expand-symlinks.py --source=samples/appengine_with_decorator2 --dest=snapshot/samples/appengine_with_decorator2
44+
python expand-symlinks.py --source=samples/appengine --dest=snapshot/samples/appengine
45+
cp setup_oauth2client.py snapshot/setup.py
46+
cp setup_utils.py snapshot/setup_utils.py
47+
cp MANIFEST_oauth2client.in snapshot/MANIFEST.in
48+
cp README_oauth2client snapshot/README
49+
cd snapshot; python setup.py clean
50+
cd snapshot; python setup.py sdist --formats=gztar,zip
51+
52+
.PHONY: oauth2_release
53+
oauth2_release: oauth2_prerelease
54+
@echo "This target will upload a new release to PyPi and code.google.com hosting."
55+
@echo "Are you sure you want to proceed? (yes/no)"
56+
@read yn; [ "yes" == $$yn ]
57+
@echo "Here we go..."
58+
cd snapshot; python setup.py sdist --formats=gztar,zip register upload
59+
wget "http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py" -O googlecode_upload.py
60+
python googlecode_upload.py --summary="Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.tar.gz
61+
python googlecode_upload.py --summary="Version $(shell python setup.py --version)" --project=google-api-python-client snapshot/dist/*.zip

‎README_oauth2client‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
This is a client library for accessing resources protected by OAuth 2.0.
2+
3+
4+
Installation
5+
============
6+
7+
To install, simply say
8+
9+
$ python setup.py install
10+
11+
If you want to do a "mock install" and simply extend your PYTHONPATH
12+
for the current shell to include this folder and the packages in it, do
13+
14+
$ source setpath.sh
15+
16+
from the root of the project directory.
17+
18+
19+
20+
Third Party Libraries
21+
=====================
22+
23+
These libraries will be installed when you install the client library:
24+
25+
http://code.google.com/p/httplib2
26+
http://code.google.com/p/python-gflags
27+
28+
Depending on your version of Python, these libraries may also be installed:
29+
30+
http://pypi.python.org/pypi/simplejson/
31+

‎expand-symlinks.py‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
#!/usr/bin/python2.4
2+
# -*- coding: utf-8 -*-
3+
#
4+
# Copyright (C) 2010 Google Inc.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
18+
"""Copy files from source to dest expanding symlinks along the way.
19+
"""
20+
121
from distutils.dir_util import copy_tree
222

3-
copy_tree('.', 'snapshot', verbose=True)
23+
import gflags
24+
import sys
25+
26+
27+
FLAGS = gflags.FLAGS
28+
29+
gflags.DEFINE_string('source', '.', 'Directory name to copy from.')
30+
gflags.DEFINE_string('dest', 'snapshot', 'Directory name to copy to.')
31+
32+
33+
def main(argv):
34+
# Let the gflags module process the command-line arguments
35+
try:
36+
argv = FLAGS(argv)
37+
except gflags.FlagsError, e:
38+
print '%s\\nUsage: %s ARGS\\n%s' % (e, argv[0], FLAGS)
39+
sys.exit(1)
40+
41+
copy_tree(FLAGS.source, FLAGS.dest, verbose=True)
42+
43+
44+
if __name__ == '__main__':
45+
main(sys.argv)

‎samples/appengine/main.py‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@
3636
from google.appengine.ext.webapp.util import login_required
3737

3838

39+
FLOW = OAuth2WebServerFlow(
40+
# Visit https://code.google.com/apis/console to
41+
# generate your client_id, client_secret and to
42+
# register your redirect_uri.
43+
client_id='<YOUR CLIENT ID HERE>',
44+
client_secret='<YOUR CLIENT SECRET HERE>',
45+
scope='https://www.googleapis.com/auth/buzz',
46+
user_agent='buzz-cmdline-sample/1.0')
47+
48+
3949
class Credentials(db.Model):
4050
credentials = CredentialsProperty()
4151

@@ -49,20 +59,9 @@ def get(self):
4959
Credentials, user.user_id(), 'credentials').get()
5060

5161
if credentials is None or credentials.invalid == True:
52-
flow = OAuth2WebServerFlow(
53-
# Visit https://code.google.com/apis/console to
54-
# generate your client_id, client_secret and to
55-
# register your redirect_uri.
56-
client_id='<YOUR CLIENT ID HERE>',
57-
client_secret='<YOUR CLIENT SECRET HERE>',
58-
scope='https://www.googleapis.com/auth/buzz',
59-
user_agent='buzz-cmdline-sample/1.0',
60-
domain='anonymous',
61-
xoauth_displayname='Google App Engine Example App')
62-
63-
callback = self.request.relative_url('/auth_return')
64-
authorize_url = flow.step1_get_authorize_url(callback)
65-
memcache.set(user.user_id(), pickle.dumps(flow))
62+
callback = self.request.relative_url('/oauth2callback')
63+
authorize_url = FLOW.step1_get_authorize_url(callback)
64+
memcache.set(user.user_id(), pickle.dumps(FLOW))
6665
self.redirect(authorize_url)
6766
else:
6867
http = httplib2.Http()
@@ -99,7 +98,7 @@ def main():
9998
application = webapp.WSGIApplication(
10099
[
101100
('/', MainHandler),
102-
('/auth_return', OAuthHandler)
101+
('/oauth2callback', OAuthHandler)
103102
],
104103
debug=True)
105104
util.run_wsgi_app(application)

‎samples/oauth2/dailymotion/apiclient‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎samples/oauth2/dailymotion/main.py‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import os
2424
import pickle
2525

26-
from apiclient.discovery import build
2726
from oauth2client.appengine import CredentialsProperty
2827
from oauth2client.appengine import StorageByKeyName
2928
from oauth2client.client import OAuth2WebServerFlow
@@ -36,6 +35,16 @@
3635
from google.appengine.ext.webapp.util import login_required
3736

3837

38+
FLOW = OAuth2WebServerFlow(
39+
client_id='2ad565600216d25d9cde',
40+
client_secret='03b56df2949a520be6049ff98b89813f17b467dc',
41+
scope='read',
42+
user_agent='oauth2client-sample/1.0',
43+
auth_uri='https://api.dailymotion.com/oauth/authorize',
44+
token_uri='https://api.dailymotion.com/oauth/token'
45+
)
46+
47+
3948
class Credentials(db.Model):
4049
credentials = CredentialsProperty()
4150

@@ -49,37 +58,23 @@ def get(self):
4958
Credentials, user.user_id(), 'credentials').get()
5059

5160
if credentials is None or credentials.invalid == True:
52-
flow = OAuth2WebServerFlow(
53-
client_id='2ad565600216d25d9cde',
54-
client_secret='03b56df2949a520be6049ff98b89813f17b467dc',
55-
scope='read',
56-
user_agent='oauth2client-sample/1.0',
57-
auth_uri='https://api.dailymotion.com/oauth/authorize',
58-
token_uri='https://api.dailymotion.com/oauth/token'
59-
)
60-
6161
callback = self.request.relative_url('/auth_return')
62-
authorize_url = flow.step1_get_authorize_url(callback)
63-
memcache.set(user.user_id(), pickle.dumps(flow))
62+
authorize_url = FLOW.step1_get_authorize_url(callback)
63+
memcache.set(user.user_id(), pickle.dumps(FLOW))
6464
self.redirect(authorize_url)
6565
else:
6666
http = httplib2.Http()
67-
68-
resp, content1 = http.request('https://api.dailymotion.com/me?access_token=%s' %
69-
credentials.access_token)
70-
7167
http = credentials.authorize(http)
72-
resp, content2 = http.request('https://api.dailymotion.com/me')
68+
69+
resp, content = http.request('https://api.dailymotion.com/me')
7370

7471
path = os.path.join(os.path.dirname(__file__), 'welcome.html')
7572
logout = users.create_logout_url('/')
76-
self.response.out.write(
77-
template.render(
78-
path, {
79-
'content1': content1,
80-
'content2': content2,
81-
'logout': logout
82-
}))
73+
variables = {
74+
'content': content,
75+
'logout': logout
76+
}
77+
self.response.out.write(template.render(path, variables))
8378

8479

8580
class OAuthHandler(webapp.RequestHandler):

‎samples/oauth2/dailymotion/welcome.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
</head>
99
<body>
1010
<p><a href="{{ logout }}">Logout</a></p>
11-
<h2>First request with access_token in query parameter:</h2>
12-
<pre>{{ content1 }} </pre>
13-
<h2>Second request with access_token in header:</h2>
14-
<pre>{{ content2 }} </pre>
11+
<h2>Response body:</h2>
12+
<pre>{{ content }} </pre>
1513
</body>
1614
</html>

‎samples/oauth2/django_sample/buzz/views.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
from django.shortcuts import render_to_response
1717

1818
STEP2_URI = 'http://localhost:8000/auth_return'
19-
19+
FLOW = OAuth2WebServerFlow(
20+
client_id='837647042410.apps.googleusercontent.com',
21+
client_secret='+SWwMCL9d8gWtzPRa1lXw5R8',
22+
scope='https://www.googleapis.com/auth/buzz',
23+
user_agent='buzz-django-sample/1.0',
24+
)
2025

2126
@login_required
2227
def index(request):
2328
storage = Storage(CredentialsModel, 'id', request.user, 'credential')
2429
credential = storage.get()
2530
if credential is None or credential.invalid == True:
26-
flow = OAuth2WebServerFlow(
27-
client_id='837647042410.apps.googleusercontent.com',
28-
client_secret='+SWwMCL9d8gWtzPRa1lXw5R8',
29-
scope='https://www.googleapis.com/auth/buzz',
30-
user_agent='buzz-django-sample/1.0',
31-
)
32-
33-
authorize_url = flow.step1_get_authorize_url(STEP2_URI)
34-
f = FlowModel(id=request.user, flow=flow)
31+
32+
authorize_url = FLOW.step1_get_authorize_url(STEP2_URI)
33+
f = FlowModel(id=request.user, flow=FLOW)
3534
f.save()
3635
return HttpResponseRedirect(authorize_url)
3736
else:

‎setpath.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export PYTHONPATH=`pwd`:$PYTHONPATH
1+
export PYTHONPATH=`pwd`:${PYTHONPATH}

0 commit comments

Comments
 (0)