dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possibly fixed dropbox_account.py, issue 991

Browse Source
This commit is contained in:
mdipierro
2012-09-10 11:34:37 -05:00
parent addb7dfd3a
commit 830b6f120d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.8 (2012-09-10 10:59:24) stable Version 2.0.8 (2012-09-10 11:34:33) stable
gluon/contrib/login_methods/dropbox_account.py
+8 -6
View File
@@ -53,12 +53,15 @@ class DropboxAccount(object):
def get_user(self): def get_user(self):
request = self.request request = self.request
token = current.session.dropbox_token token = current.session.dropbox_token
if not token:
return None
try: try:
access_token = self.sess.obtain_access_token(token) self.sess.set_token(token[0],token[1])
except: except:
access_token = None # invalid token, should never happen
if access_token: return None
else:
user = Storage() user = Storage()
self.client = client.DropboxClient(self.sess) self.client = client.DropboxClient(self.sess)
data = self.client.account_info() data = self.client.account_info()
@@ -70,11 +73,10 @@ class DropboxAccount(object):
if not user['registration_id'] and self.on_login_failure: if not user['registration_id'] and self.on_login_failure:
redirect(self.on_login_failure) redirect(self.on_login_failure)
return user return user
return None
def login_form(self): def login_form(self):
token = self.sess.obtain_request_token() token = self.sess.obtain_request_token()
current.session.dropbox_token = token current.session.dropbox_token = (token.key,token.secret)
dropbox_url = self.sess.build_authorize_url(token,self.login_url) dropbox_url = self.sess.build_authorize_url(token,self.login_url)
redirect(dropbox_url) redirect(dropbox_url)
form = IFRAME(_src=dropbox_url, form = IFRAME(_src=dropbox_url,