Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters.

eos/db/saveddata/crest.py

@@ -17,7 +17,7 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, String, DateTime
+from sqlalchemy import Table, Column, Integer, String, DateTime, UniqueConstraint
 from sqlalchemy.orm import mapper
 import datetime
 
@@ -27,12 +27,15 @@ from eos.saveddata.ssocharacter import SsoCharacter
 sso_table = Table("ssoCharacter", saveddata_meta,
                     Column("ID", Integer, primary_key=True),
                     Column("client", String, nullable=False),
-                    Column("characterID", Integer, nullable=False, unique=True),
-                    Column("characterName", String, nullable=False, unique=True),
+                    Column("characterID", Integer, nullable=False),
+                    Column("characterName", String, nullable=False),
                     Column("refreshToken", String, nullable=False),
                     Column("accessToken", String, nullable=False),
                     Column("accessTokenExpires", DateTime, nullable=False),
                     Column("created", DateTime, nullable=True, default=datetime.datetime.now),
-                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now))
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                    UniqueConstraint('client', 'characterID', name='uix_client_characterID'),
+                    UniqueConstraint('client', 'characterName', name='uix_client_characterName')
+                  )
 
 mapper(SsoCharacter, sso_table)

eos/db/saveddata/queries.py

@@ -467,29 +467,28 @@ def getProjectedFits(fitID):
         raise TypeError("Need integer as argument")
 
 
-def getSsoCharacters(eager=None):
+def getSsoCharacters(clientHash, eager=None):
     eager = processEager(eager)
     with sd_lock:
-        characters = saveddata_session.query(SsoCharacter).options(*eager).all()
+        characters = saveddata_session.query(SsoCharacter).filter(SsoCharacter.client == clientHash).options(*eager).all()
     return characters
 
 
 @cachedQuery(SsoCharacter, 1, "lookfor")
-def getSsoCharacter(lookfor, eager=None):
+def getSsoCharacter(lookfor, clientHash, eager=None):
+    filter = SsoCharacter.client == clientHash
+
     if isinstance(lookfor, int):
-        if eager is None:
-            with sd_lock:
-                character = saveddata_session.query(SsoCharacter).get(lookfor)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                character = saveddata_session.query(SsoCharacter).options(*eager).filter(SsoCharacter.ID == lookfor).first()
+        filter = and_(filter, SsoCharacter.characterID == lookfor)
     elif isinstance(lookfor, str):
-        eager = processEager(eager)
-        with sd_lock:
-            character = saveddata_session.query(SsoCharacter).options(*eager).filter(SsoCharacter.name == lookfor).first()
+        filter = and_(filter, SsoCharacter.characterName == lookfor)
     else:
         raise TypeError("Need integer or string as argument")
+
+    eager = processEager(eager)
+    with sd_lock:
+        character = saveddata_session.query(SsoCharacter).options(*eager).filter(filter).first()
+
     return character
 
 
@@ -544,7 +543,7 @@ def commit():
         try:
             saveddata_session.commit()
             saveddata_session.flush()
-        except Exception:
+        except Exception as ex:
             saveddata_session.rollback()
             exc_info = sys.exc_info()
             raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])

eos/saveddata/ssocharacter.py

@@ -25,13 +25,13 @@ import time
 
 
 class SsoCharacter(object):
-    def __init__(self, id, charID, name, client, accessToken, refreshToken=None):
-        self.ID = id
+    def __init__(self, charID, name, client, accessToken=None, refreshToken=None):
         self.characterID = charID
         self.characterName = name
         self.client = client
         self.accessToken = accessToken
         self.refreshToken = refreshToken
+        self.esi_client = None
 
     @reconstructor
     def init(self):
@@ -51,7 +51,7 @@ class SsoCharacter(object):
     def update_token(self, tokenResponse):
         """ helper function to update token data from SSO response """
         self.accessToken = tokenResponse['access_token']
-        self.accessTokenExpires = datetime.fromtimestamp(
+        self.accessTokenExpires = datetime.datetime.fromtimestamp(
             time.time() + tokenResponse['expires_in'],
         )
         if 'refresh_token' in tokenResponse: