Merge remote branch 'origin/oauth_1_0a'

Author: Nathan Hamblen

app.py

@@ -14,6 +14,7 @@
 
 from optparse import OptionParser
 import webbrowser
+import sys
 
 def config_client(config_name=None):
  return get_client(get_config(config_name)[1])
@@ -49,6 +50,10 @@ def set_token(config, name, key, secret):
  option = OptionParser('%prog [options] [consumer-key] [consumer-secret]')
  option.add_option('--config', dest='config', 
  help='read & write settings to CONFIG, default is app.cfg')
+ option.add_option('--verifier', dest='verifier', 
+ help='oauth_callback for request-token request, defaults to oob')
+ option.add_option('--callback', dest='callback', default='oob',
+ help='oauth_verifier, required to gain access token')
  (options, args) = option.parse_args()
 
  config_name, config = get_config(options.config)
@@ -62,7 +67,7 @@ def set_token(config, name, key, secret):
  mucli = get_client(config)
 
  def access_granted():
- print """
+ print """\
  access-key: %s
  accses-secret: %s
  
@@ -73,14 +78,16 @@ def access_granted():
  access_granted()
  else:
  if config.has_section('request'):
+ if not options.verifier:
+ sys.exit("To complete the process you must supply a --verifier")
  request_key, request_secret = get_token(config, 'request')
  oauth_session = mucli.new_session(request_key=request_key, request_secret=request_secret)
- oauth_session.fetch_access_token()
+ print " member_id: %s" % oauth_session.fetch_access_token(options.verifier)
  set_token(config, 'access', oauth_session.access_token.key, oauth_session.access_token.secret)
  access_granted()
  else:
  oauth_session = mucli.new_session()
- oauth_session.fetch_request_token()
+ oauth_session.fetch_request_token(callback=options.callback)
 
  set_token(config, 'request', oauth_session.request_token.key, oauth_session.request_token.secret)
 

meetup_api_client.py

@@ -3,6 +3,7 @@
 
 import datetime
 import time
+import cgi
 import types
 from urllib import urlencode
 from urllib2 import HTTPError, HTTPErrorProcessor, urlopen, Request, build_opener
@@ -132,8 +133,9 @@ def __init__(self, consumer, request_token, access_token):
  self.request_token = request_token
  self.access_token = access_token
 
- def fetch_request_token(self, signature_method=signature_method_hmac):
- oauth_req = oauth.OAuthRequest.from_consumer_and_token(self.consumer, http_url=(OAUTH_BASE_URL + 'oauth/request/'))
+ def fetch_request_token(self, callback="oob", signature_method=signature_method_hmac):
+ oauth_req = oauth.OAuthRequest.from_consumer_and_token(
+ self.consumer, http_url=(OAUTH_BASE_URL + 'oauth/request/'), callback=callback)
  oauth_req.sign_request(signature_method, self.consumer, None)
  token_string = urlopen(Request(oauth_req.http_url, headers=oauth_req.to_header())).read()
  self.request_token = oauth.OAuthToken.from_string(token_string)
@@ -145,14 +147,16 @@ def get_authorize_url(self, oauth_callback=None):
  callbackUrl = ""
  return OAUTH_BASE_URL + "authorize/?oauth_token=%s%s" % (self.request_token.key, callbackUrl)
 
- def fetch_access_token(self, signature_method=signature_method_hmac, request_token=None):
+ def fetch_access_token(self, oauth_verifier, signature_method=signature_method_hmac, request_token=None):
  temp_request_token = request_token or self.request_token
  if not temp_request_token:
  raise NoToken("You must provide a request token to exchange for an access token")
- oauth_req = oauth.OAuthRequest.from_consumer_and_token(self.consumer, token=temp_request_token, http_url=OAUTH_BASE_URL + 'oauth/access/')
+ oauth_req = oauth.OAuthRequest.from_consumer_and_token(self.consumer, token=temp_request_token, 
+ http_url=OAUTH_BASE_URL + 'oauth/access/', verifier=oauth_verifier)
  oauth_req.sign_request(signature_method, self.consumer, temp_request_token)
  token_string = urlopen(Request(oauth_req.http_url, headers=oauth_req.to_header())).read()
  self.access_token = oauth.OAuthToken.from_string(token_string)
+ return cgi.parse_qs(token_string)['member_id'][0]
 
 class MeetupOAuth(Meetup):