ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-06 18:33:13 +03:00
Code Issues Projects Releases Wiki Activity

Fix for non-ASCII Cmdr names

Browse Source
This commit is contained in:
Jonathan Harris 2019-01-01 16:49:16 +00:00
parent d8ef1a4721
commit 7f6c28488d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
companion.py
View File

@ -171,23 +171,23 @@ class Auth:
} }
r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=timeout) r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=timeout)
if r.status_code == requests.codes.ok: if r.status_code == requests.codes.ok:
print 'Auth\tRefreshed token for %s' % self.cmdr print 'Auth\tRefreshed token for %s' % self.cmdr.encode('utf-8')
data = r.json() data = r.json()
tokens[idx] = data.get('refresh_token', '') tokens[idx] = data.get('refresh_token', '')
config.set('fdev_apikeys', tokens) config.set('fdev_apikeys', tokens)
config.save() # Save settings now for use by command-line app config.save() # Save settings now for use by command-line app
return data.get('access_token') return data.get('access_token')
else: else:
print 'Auth\tCan\'t refresh token for %s' % self.cmdr print 'Auth\tCan\'t refresh token for %s' % self.cmdr.encode('utf-8')
self.dump(r) self.dump(r)
except: except:
print 'Auth\tCan\'t refresh token for %s' % self.cmdr print 'Auth\tCan\'t refresh token for %s' % self.cmdr.encode('utf-8')
print_exc() print_exc()
else: else:
print 'Auth\tNo token for %s' % self.cmdr print 'Auth\tNo token for %s' % self.cmdr.encode('utf-8')
# New request # New request
print 'Auth\tNew authorization request for %s' % self.cmdr print 'Auth\tNew authorization request'
self.verifier = self.base64URLEncode(os.urandom(32)) self.verifier = self.base64URLEncode(os.urandom(32))
self.state = self.base64URLEncode(os.urandom(8)) self.state = self.base64URLEncode(os.urandom(8))
# Won't work under IE <= 10 : https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/ # Won't work under IE <= 10 : https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/
@ -223,7 +223,7 @@ class Auth:
} }
r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=timeout) r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=timeout)
if r.status_code == requests.codes.ok: if r.status_code == requests.codes.ok:
print 'Auth\tNew token for %s' % self.cmdr print 'Auth\tNew token for %s' % self.cmdr.encode('utf-8')
data = r.json() data = r.json()
cmdrs = config.get('cmdrs') cmdrs = config.get('cmdrs')
idx = cmdrs.index(self.cmdr) idx = cmdrs.index(self.cmdr)
@ -234,17 +234,17 @@ class Auth:
config.save() # Save settings now for use by command-line app config.save() # Save settings now for use by command-line app
return data.get('access_token') return data.get('access_token')
else: else:
print 'Auth\tCan\'t get token for %s' % self.cmdr print 'Auth\tCan\'t get token for %s' % self.cmdr.encode('utf-8')
self.dump(r) self.dump(r)
except: except:
print 'Auth\tCan\'t get token for %s' % self.cmdr print 'Auth\tCan\'t get token for %s' % self.cmdr.encode('utf-8')
print_exc() print_exc()
raise CredentialsError() raise CredentialsError()
@staticmethod @staticmethod
def invalidate(cmdr): def invalidate(cmdr):
print 'Auth\tInvalidated token for %s' % cmdr print 'Auth\tInvalidated token for %s' % cmdr.encode('utf-8')
cmdrs = config.get('cmdrs') cmdrs = config.get('cmdrs')
idx = cmdrs.index(cmdr) idx = cmdrs.index(cmdr)
tokens = config.get('fdev_apikeys') or [] tokens = config.get('fdev_apikeys') or []