fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-21 07:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

OAuthManager: introduce access_token and access_token_expires properties

Browse Source
This commit is contained in:
Laurent Monin
2019-03-24 16:20:25 +01:00
parent d91bf51204
commit cc1b26bc08
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
picard/oauth.py
View File

@@ -76,6 +76,28 @@ class OAuthManager(object):
else:
config.persist["oauth_refresh_token_scopes"] = value
@property
def access_token(self):
return config.persist["oauth_access_token"]
@access_token.setter
def access_token(self, value):
if value is None:
config.persist.remove("oauth_access_token")
else:
config.persist["oauth_access_token"] = value
@property
def access_token_expires(self):
return config.persist["oauth_access_token_expires"]
@access_token_expires.setter
def access_token_expires(self, value):
if value is None:
config.persist.remove("oauth_access_token_expires")
else:
config.persist["oauth_access_token_expires"] = value
def is_authorized(self):
return bool(self.refresh_token and self.refresh_token_scopes)
@@ -92,17 +114,15 @@ class OAuthManager(object):
self.refresh_token_scopes = None
def forget_access_token(self):
config.persist.remove("oauth_access_token")
config.persist.remove("oauth_access_token_expires")
self.access_token = None
self.access_token_expires = None
def get_access_token(self, callback):
if not self.is_authorized():
callback(None)
else:
access_token = config.persist["oauth_access_token"]
access_token_expires = config.persist["oauth_access_token_expires"]
if access_token and time.time() < access_token_expires:
callback(access_token)
if self.access_token and time.time() < self.access_token_expires:
callback(self.access_token)
else:
self.forget_access_token()
self.refresh_access_token(callback)
@@ -122,8 +142,8 @@ class OAuthManager(object):
def set_access_token(self, access_token, expires_in):
log.debug("OAuth: got access_token %s that expires in %s seconds", access_token, expires_in)
config.persist["oauth_access_token"] = access_token
config.persist["oauth_access_token_expires"] = int(time.time() + expires_in - 60)
self.access_token = access_token
self.access_token_expires = int(time.time() + expires_in - 60)
def set_username(self, username):
log.debug("OAuth: got username %s", username)
@@ -155,8 +175,8 @@ class OAuthManager(object):
if response["error"] == "invalid_grant":
self.forget_refresh_token()
else:
self.set_access_token(data["access_token"], data["expires_in"])
access_token = data["access_token"]
self.set_access_token(access_token, data["expires_in"])
except Exception as e:
log.error('OAuth: Unexpected error handling access token response: %r', e)
finally: