matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fix bug with login token not being properly written in cache.

Browse Source
This commit is contained in:
Rapptz 2016-06-12 23:23:36 -04:00
parent b496ea7972
commit 3895cf9295
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discord/client.py
View File

@ -125,7 +125,6 @@ class Client:
""" """
def __init__(self, *, loop=None, **options): def __init__(self, *, loop=None, **options):
self.ws = None self.ws = None
self.token = None
self.loop = asyncio.get_event_loop() if loop is None else loop self.loop = asyncio.get_event_loop() if loop is None else loop
self._listeners = [] self._listeners = []
self.cache_auth = options.get('cache_auth', True) self.cache_auth = options.get('cache_auth', True)
@ -171,7 +170,7 @@ class Client:
os.makedirs(os.path.dirname(cache_file), exist_ok=True) os.makedirs(os.path.dirname(cache_file), exist_ok=True)
with os.fdopen(os.open(cache_file, os.O_WRONLY | os.O_CREAT, 0o0600), 'w') as f: with os.fdopen(os.open(cache_file, os.O_WRONLY | os.O_CREAT, 0o0600), 'w') as f:
log.info('updating login cache') log.info('updating login cache')
f.write(self.token) f.write(self.http.token)
except OSError: except OSError:
log.info('a problem occurred while updating the login cache') log.info('a problem occurred while updating the login cache')
pass pass
@ -300,7 +299,7 @@ class Client:
if self.cache_auth: if self.cache_auth:
token = self._get_cache_token(email, password) token = self._get_cache_token(email, password)
try: try:
self.http.static_login(token, bot=False) yield from self.http.static_login(token, bot=False)
except: except:
log.info('cache auth token is out of date') log.info('cache auth token is out of date')
else: else:
@ -1383,6 +1382,8 @@ class Client:
yield from self.http.edit_profile(**args) yield from self.http.edit_profile(**args)
if not_bot_account: if not_bot_account:
self.email = data['email'] self.email = data['email']
if 'token' in data:
self.http._token(data['token'], bot=False)
if self.cache_auth: if self.cache_auth:
self._update_cache(self.email, password) self._update_cache(self.email, password)