ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-21 19:37:39 +03:00
Code Issues Projects Releases Wiki Activity

Tidy login handling.

Browse Source
This commit is contained in:
Jonathan Harris 2016-01-20 05:38:12 +00:00
parent 7cedb01b19
commit 4d37889bbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
companion.py
View File

@ -188,10 +188,10 @@ class Session:
if 'server error' in r.text:
self.dump(r)
raise ServerError()
elif 'Password' in r.text:
elif r.url == URL_LOGIN: # would have redirected away if success
self.dump(r)
raise CredentialsError()
elif 'Verification Code' in r.text:
elif r.url == URL_CONFIRM: # redirected to verification page
self.state = Session.STATE_AUTH
raise VerificationRequired()
else:
@ -203,7 +203,7 @@ class Session:
raise VerificationRequired()
r = self.session.post(URL_CONFIRM, data = {'code' : code}, timeout=timeout)
r.raise_for_status()
if r.url == URL_CONFIRM: # redirects away on success
if r.url == URL_CONFIRM: # would have redirected away if success
raise VerificationRequired()
self.save() # Save cookies now for use by command-line app
self.login()
@ -223,7 +223,7 @@ class Session:
if r.status_code != requests.codes.ok:
self.dump(r)
if r.status_code == requests.codes.forbidden or (r.history and r.url == URL_LOGIN):
if r.status_code == requests.codes.forbidden or r.url == URL_LOGIN:
# Start again - maybe our session cookie expired?
self.login()
return self.query()