diff --git a/VERSION b/VERSION index 3b03afc7..a2c32e82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.8 (2012-09-10 10:59:24) stable +Version 2.0.8 (2012-09-10 11:34:33) stable diff --git a/gluon/contrib/login_methods/dropbox_account.py b/gluon/contrib/login_methods/dropbox_account.py index bfd94723..a87d8661 100644 --- a/gluon/contrib/login_methods/dropbox_account.py +++ b/gluon/contrib/login_methods/dropbox_account.py @@ -53,12 +53,15 @@ class DropboxAccount(object): def get_user(self): request = self.request - token = current.session.dropbox_token + token = current.session.dropbox_token + if not token: + return None try: - access_token = self.sess.obtain_access_token(token) + self.sess.set_token(token[0],token[1]) except: - access_token = None - if access_token: + # invalid token, should never happen + return None + else: user = Storage() self.client = client.DropboxClient(self.sess) data = self.client.account_info() @@ -70,11 +73,10 @@ class DropboxAccount(object): if not user['registration_id'] and self.on_login_failure: redirect(self.on_login_failure) return user - return None def login_form(self): 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) redirect(dropbox_url) form = IFRAME(_src=dropbox_url,