diff --git a/config.py b/config.py index cdab4bffa..e44283923 100644 --- a/config.py +++ b/config.py @@ -25,6 +25,8 @@ expansionName = "Vanguard" expansionVersion = "1.0" evemonMinVersion = "4081" +clientID = 'af87365240d644f7950af563b8418bad' + pyfaPath = None savePath = None saveDB = None diff --git a/gui/crestFittings.py b/gui/crestFittings.py index 39af6ae4d..2438ea39d 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -1,11 +1,14 @@ import wx +import json + +from wx.lib.pubsub import setupkwargs +from wx.lib.pubsub import pub import service import gui.display as d from eos.types import Cargo from eos.db import getItem import time -import json class CrestFittings(wx.Frame): @@ -27,11 +30,8 @@ class CrestFittings(wx.Frame): characterSelectSizer.Add( self.stLogged, 0, wx.ALL, 5 ) else: self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, []) - chars = sCrest.getCrestCharacters() - for char in chars: - self.charChoice.Append(char.name, char.ID) - self.charChoice.SetSelection(0) characterSelectSizer.Add( self.charChoice, 1, wx.ALL, 5 ) + self.updateCharList() self.fetchBtn = wx.Button( self, wx.ID_ANY, u"Fetch Fits", wx.DefaultPosition, wx.DefaultSize, 5 ) characterSelectSizer.Add( self.fetchBtn, 0, wx.ALL, 5 ) @@ -66,6 +66,18 @@ class CrestFittings(wx.Frame): self.Centre(wx.BOTH) + def updateCharList(self): + sCrest = service.Crest.getInstance() + chars = sCrest.getCrestCharacters() + + if len(chars) == 0: + self.Close() + + for char in chars: + self.charChoice.Append(char.name, char.ID) + + self.charChoice.SetSelection(0) + def ssoLogout(self, message): self.Close() @@ -92,7 +104,6 @@ class CrestFittings(wx.Frame): fits = sFit.importFitFromBuffer(data) self.mainFrame._openAfterImport(fits) - class ExportToEve(wx.Frame): def __init__(self, parent): @@ -111,12 +122,8 @@ class ExportToEve(wx.Frame): mainSizer.Add( self.stLogged, 0, wx.ALL, 5 ) else: self.charChoice = wx.Choice(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, []) - chars = sCrest.getCrestCharacters() - for char in chars: - self.charChoice.Append(char.name, char.ID) - self.charChoice.SetSelection(0) mainSizer.Add( self.charChoice, 1, wx.ALL, 5 ) - + self.updateCharList() self.charChoice.SetSelection(0) self.exportBtn = wx.Button( self, wx.ID_ANY, u"Export Fit", wx.DefaultPosition, wx.DefaultSize, 5 ) @@ -136,6 +143,18 @@ class ExportToEve(wx.Frame): self.Centre(wx.BOTH) + def updateCharList(self): + sCrest = service.Crest.getInstance() + chars = sCrest.getCrestCharacters() + + if len(chars) == 0: + self.Close() + + for char in chars: + self.charChoice.Append(char.name, char.ID) + + self.charChoice.SetSelection(0) + def ssoLogout(self, message): self.Close() @@ -214,6 +233,71 @@ class CrestCharacterInfo(wx.Dialog): sCrest.logout() self.Close() +class CrestMgmt(wx.Dialog): + + def __init__( self, parent ): + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = "CREST Character Management", pos = wx.DefaultPosition, size = wx.Size( 550,250 ), style = wx.DEFAULT_DIALOG_STYLE ) + + mainSizer = wx.BoxSizer( wx.HORIZONTAL ) + + self.lcCharacters = wx.ListCtrl( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_REPORT) + + self.lcCharacters.InsertColumn(0, heading='Character') + self.lcCharacters.InsertColumn(1, heading='Refresh Token') + + self.popCharList() + + mainSizer.Add( self.lcCharacters, 1, wx.ALL|wx.EXPAND, 5 ) + + btnSizer = wx.BoxSizer( wx.VERTICAL ) + + self.addBtn = wx.Button( self, wx.ID_ANY, u"Add Character", wx.DefaultPosition, wx.DefaultSize, 0 ) + btnSizer.Add( self.addBtn, 0, wx.ALL | wx.EXPAND, 5 ) + + self.deleteBtn = wx.Button( self, wx.ID_ANY, u"Revoke Character", wx.DefaultPosition, wx.DefaultSize, 0 ) + btnSizer.Add( self.deleteBtn, 0, wx.ALL | wx.EXPAND, 5 ) + + mainSizer.Add( btnSizer, 0, wx.EXPAND, 5 ) + + self.addBtn.Bind(wx.EVT_BUTTON, self.addChar) + self.deleteBtn.Bind(wx.EVT_BUTTON, self.delChar) + + pub.subscribe(self.ssoLogin, 'login_success') + + self.SetSizer( mainSizer ) + self.Layout() + + self.Centre( wx.BOTH ) + + def ssoLogin(self, type): + self.popCharList() + + def popCharList(self): + sCrest = service.Crest.getInstance() + chars = sCrest.getCrestCharacters() + + self.lcCharacters.DeleteAllItems() + + for index, char in enumerate(chars): + self.lcCharacters.InsertStringItem(index, char.name) + self.lcCharacters.SetStringItem(index, 1, char.refresh_token) + self.lcCharacters.SetItemData(index, char.ID) + + self.lcCharacters.SetColumnWidth(0, wx.LIST_AUTOSIZE) + self.lcCharacters.SetColumnWidth(1, wx.LIST_AUTOSIZE) + + def addChar(self, event): + sCrest = service.Crest.getInstance() + uri = sCrest.startServer() + wx.LaunchDefaultBrowser(uri) + + def delChar(self, event): + item = self.lcCharacters.GetFirstSelected() + charID = self.lcCharacters.GetItemData(item) + sCrest = service.Crest.getInstance() + sCrest.delCrestCharacter(charID) + self.popCharList() + class FittingsTreeView(wx.Panel): def __init__(self, parent): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, style=wx.TAB_TRAVERSAL) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 6dbfed3aa..5bc85793b 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -44,7 +44,7 @@ from gui.multiSwitch import MultiSwitch from gui.statsPane import StatsPane from gui.shipBrowser import ShipBrowser, FitSelected, ImportSelected, Stage3Selected from gui.characterEditor import CharacterEditor, SaveCharacterAs -from gui.crestFittings import CrestFittings, ExportToEve, CrestCharacterInfo +from gui.crestFittings import CrestFittings, ExportToEve, CrestCharacterInfo, CrestMgmt from gui.characterSelection import CharacterSelection from gui.patternEditor import DmgPatternEditorDlg from gui.resistsEditor import ResistsEditorDlg @@ -508,7 +508,7 @@ class MainFrame(wx.Frame): uri = sCrest.startServer() wx.LaunchDefaultBrowser(uri) else: - dlg=CrestCharacterInfo(self) + dlg=CrestMgmt(self) dlg.Show() def exportToEve(self, event): diff --git a/service/crest.py b/service/crest.py index d52fe27e2..8863433a4 100644 --- a/service/crest.py +++ b/service/crest.py @@ -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) diff --git a/service/html.py b/service/html.py index b073f7803..7f8c17fa3 100644 --- a/service/html.py +++ b/service/html.py @@ -6,8 +6,6 @@ HTML = ''' Done. Please close this window. - -(will put more interesting messages here later)