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

Add character management window, ability to add and delete crest characters, and fix issue with not having default client ID available.

Browse Source
This commit is contained in:
blitzmann
2015-10-23 21:26:38 -04:00
parent 9929510e53
commit 08382db011
5 changed files with 123 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
service/crest.py
View File

@@ -5,13 +5,12 @@ import copy
import service
from service.server import *
import uuid
import config
from gui.utils.repeatedTimer import RepeatedTimer
from wx.lib.pubsub import setupkwargs
from wx.lib.pubsub import pub
# TODO:
# With implicit grant, make sure we know when it expires and delete/inactive char
class Crest():
# @todo: move this to settings
@@ -36,7 +35,7 @@ class Crest():
# Base EVE connection that is copied to all characters
self.eve = pycrest.EVE(
client_id=self.settings.get('clientID'),
client_id=self.settings.get('clientID') if self.settings.get('mode') == 1 else config.clientID,
api_key=self.settings.get('clientSecret') if self.settings.get('mode') == 1 else None,
redirect_uri=self.clientCallback,
testing=self.clientTest)
@@ -44,6 +43,10 @@ class Crest():
self.implicitCharacter = None
pub.subscribe(self.handleLogin, 'sso_login')
def delCrestCharacter(self, charID):
char = eos.db.getCrestCharacter(charID)
eos.db.remove(char)
def getCrestCharacters(self):
chars = eos.db.getCrestCharacters()
for char in chars:
@@ -52,6 +55,9 @@ class Crest():
# Give EVE instance refresh info. This allows us to set it
# without actually making the request to authorize at this time.
char.eve.temptoken_authorize(refresh_token=char.refresh_token)
wx.CallAfter(pub.sendMessage, 'crest_delete', message=None)
return chars
def getCrestCharacter(self, charID):
@@ -64,7 +70,7 @@ class Crest():
return self.implicitCharacter
char = eos.db.getCrestCharacter(charID)
if not hasattr(char, "eve"):
if char and not hasattr(char, "eve"):
char.eve = copy.copy(self.eve)
char.eve.temptoken_authorize(refresh_token=char.refresh_token)
return char
@@ -78,12 +84,6 @@ class Crest():
res = char.eve._session.post('https://api-sisi.testeveonline.com/characters/%d/fittings/'%char.ID, data=json)
return res
def newChar(self, connection):
connection()
info = connection.whoami()
char = CrestUser(info['CharacterName'], info['CharacterID'], connection.refresh_token)
eos.db.save(char)
def logout(self):
self.implicitCharacter = None
self.ssoTimer.stop()
@@ -119,13 +119,24 @@ class Crest():
self.implicitCharacter = CrestUser(info['CharacterID'], info['CharacterName'])
self.implicitCharacter.eve = eve
self.implicitCharacter.fetchImage()
print self.implicitCharacter.eve, self.implicitCharacter.eve.refresh_token
wx.CallAfter(pub.sendMessage, 'login_success', type=0)
elif 'code' in message:
print "handle authentication code"
eve = copy.copy(self.eve)
eve.authorize(message['code'][0])
eve()
info = eve.whoami()
#wx.CallAfter(pub.sendMessage, 'login_success', type=1)
# check if we have character already. If so, simply replace refresh_token
char = self.getCrestCharacter(int(info['CharacterID']))
if char:
char.refresh_token = eve.refresh_token
else:
char = CrestUser(info['CharacterID'], info['CharacterName'], eve.refresh_token)
char.eve = eve
eos.db.save(char)
wx.CallAfter(pub.sendMessage, 'login_success', type=1)

2
service/html.py
View File

@@ -6,8 +6,6 @@ HTML = '''
<html>
<body>
Done. Please close this window.
(will put more interesting messages here later)
<script type="text/javascript">
function extractFromHash(name, hash) {
var match = hash.match(new RegExp(name + "=([^&]+)"));