From: javyer <javyer@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 29 May 2013 21:56:57 +0000 (+0000)
Subject: Fixed twitter login
X-Git-Tag: live~32
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/f2adae4888519f788a260e329f5963eb19596983?ds=sidebyside

Fixed twitter login

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1285 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum_modules/oauthauth/consumer.py b/forum_modules/oauthauth/consumer.py
index 1d04aa2..bbbaac8 100644
--- a/forum_modules/oauthauth/consumer.py
+++ b/forum_modules/oauthauth/consumer.py
@@ -40,7 +40,7 @@ class OAuthAbstractAuthConsumer(AuthenticationConsumer):
         if token.key != request.GET.get('oauth_token', 'no-token'):
             raise InvalidAuthentication(_("Something went wrong! Auth tokens do not match"))
 
-        access_token = self.fetch_access_token(token)
+        access_token = self.fetch_access_token(token, request.GET.get('oauth_verifier', '')) 
 
         return access_token.to_string()
 
@@ -74,8 +74,9 @@ class OAuthAbstractAuthConsumer(AuthenticationConsumer):
         full_url='%s?%s'%(self.authorization_url, data)
         return full_url
 
-    def fetch_access_token(self, token):
+    def fetch_access_token(self, token, oauth_verifier): 
         oauth_request = oauth2.Request.from_consumer_and_token(self.consumer, token=token, http_url=self.access_token_url)
+        oauth_request['oauth_verifier'] = oauth_verifier 
         oauth_request.sign_request(self.signature_method, self.consumer, token)
         params = oauth_request
         data = urllib.urlencode(params)