dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Separate the server login handler from the sso info handler

Browse Source
This commit is contained in:
Ryan Holmes
2018-03-17 20:31:38 -04:00
parent 033647da61
commit 199763bcca
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
service/esi.py
View File

@@ -207,24 +207,15 @@ class Esi(object):
uri = esisecurity.get_auth_uri(state=self.state, redirect='http://localhost:{}'.format(port), pyfa_version=config.version) uri = esisecurity.get_auth_uri(state=self.state, redirect='http://localhost:{}'.format(port), pyfa_version=config.version)
self.serverThread = threading.Thread(target=self.httpd.serve, args=(self.handleLogin,)) self.serverThread = threading.Thread(target=self.httpd.serve, args=(self.handleServerLogin,))
self.serverThread.name = "SsoCallbackServer" self.serverThread.name = "SsoCallbackServer"
self.serverThread.daemon = True self.serverThread.daemon = True
self.serverThread.start() self.serverThread.start()
return uri return uri
def handleLogin(self, message): def handleLogin(self, ssoInfo):
if not message: auth_response = json.loads(base64.b64decode(ssoInfo))
raise Exception("Could not parse out querystring parameters.")
if message['state'][0] != self.state:
pyfalog.warn("OAUTH state mismatch")
raise Exception("OAUTH State Mismatch.")
pyfalog.debug("Handling SSO login with: {0}", message)
auth_response = json.loads(base64.b64decode(message['SSOInfo'][0]))
# We need to preload the ESI Security object beforehand with the auth response so that we can use verify to # We need to preload the ESI Security object beforehand with the auth response so that we can use verify to
# get character information # get character information
@@ -246,5 +237,16 @@ class Esi(object):
Esi.update_token(currentCharacter, auth_response) # this also sets the esi security token Esi.update_token(currentCharacter, auth_response) # this also sets the esi security token
eos.db.save(currentCharacter) eos.db.save(currentCharacter)
wx.PostEvent(self.mainFrame, GE.SsoLogin(character = currentCharacter)) wx.PostEvent(self.mainFrame, GE.SsoLogin(character=currentCharacter))
def handleServerLogin(self, message):
if not message:
raise Exception("Could not parse out querystring parameters.")
if message['state'][0] != self.state:
pyfalog.warn("OAUTH state mismatch")
raise Exception("OAUTH State Mismatch.")
pyfalog.debug("Handling SSO login with: {0}", message)
self.handleLogin(message['SSOInfo'][0])