Start ripping CREST stuff out, add new SSOCharacter stuff in. Long process ahead.

eos/db/saveddata/crest.py

@@ -22,13 +22,17 @@ from sqlalchemy.orm import mapper
 import datetime
 
 from eos.db import saveddata_meta
-from eos.saveddata.crestchar import CrestChar
+from eos.saveddata.ssocharacter import SsoCharacter
 
-crest_table = Table("crest", saveddata_meta,
+sso_table = Table("ssoCharacter", saveddata_meta,
                     Column("ID", Integer, primary_key=True),
-                    Column("name", String, nullable=False, unique=True),
-                    Column("refresh_token", String, nullable=False),
-                    # These records aren't updated. Instead, they are dropped and created, hence we don't have a modified field
-                    Column("created", DateTime, nullable=True, default=datetime.datetime.now))
+                    Column("client", String, nullable=False),
+                    Column("characterID", Integer, nullable=False, unique=True),
+                    Column("characterName", String, nullable=False, unique=True),
+                    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))
 
-mapper(CrestChar, crest_table)
+mapper(SsoCharacter, sso_table)

eos/db/saveddata/queries.py

@@ -27,7 +27,7 @@ from eos.db.saveddata.fit import projectedFits_table
 from eos.db.util import processEager, processWhere
 from eos.saveddata.price import Price
 from eos.saveddata.user import User
-from eos.saveddata.crestchar import CrestChar
+from eos.saveddata.ssocharacter import SsoCharacter
 from eos.saveddata.damagePattern import DamagePattern
 from eos.saveddata.targetResists import TargetResists
 from eos.saveddata.character import Character
@@ -467,27 +467,27 @@ def getProjectedFits(fitID):
         raise TypeError("Need integer as argument")
 
 
-def getCrestCharacters(eager=None):
+def getSsoCharacters(eager=None):
     eager = processEager(eager)
     with sd_lock:
-        characters = saveddata_session.query(CrestChar).options(*eager).all()
+        characters = saveddata_session.query(SsoCharacter).options(*eager).all()
     return characters
 
 
-@cachedQuery(CrestChar, 1, "lookfor")
-def getCrestCharacter(lookfor, eager=None):
+@cachedQuery(SsoCharacter, 1, "lookfor")
+def getSsoCharacter(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             with sd_lock:
-                character = saveddata_session.query(CrestChar).get(lookfor)
+                character = saveddata_session.query(SsoCharacter).get(lookfor)
         else:
             eager = processEager(eager)
             with sd_lock:
-                character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.ID == lookfor).first()
+                character = saveddata_session.query(SsoCharacter).options(*eager).filter(SsoCharacter.ID == lookfor).first()
     elif isinstance(lookfor, str):
         eager = processEager(eager)
         with sd_lock:
-            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
+            character = saveddata_session.query(SsoCharacter).options(*eager).filter(SsoCharacter.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return character

eos/saveddata/crestchar.py

@@ -1,34 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-# ===============================================================================
-
-from sqlalchemy.orm import reconstructor
-
-
-# from tomorrow import threads
-
-
-class CrestChar(object):
-    def __init__(self, id, name, refresh_token=None):
-        self.ID = id
-        self.name = name
-        self.refresh_token = refresh_token
-
-    @reconstructor
-    def init(self):
-        pass

eos/saveddata/ssocharacter.py

@@ -0,0 +1,60 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+from sqlalchemy.orm import reconstructor
+import datetime
+import time
+
+# from tomorrow import threads
+
+
+class SsoCharacter(object):
+    def __init__(self, id, charID, name, client, accessToken, refreshToken=None):
+        self.ID = id
+        self.characterID = charID
+        self.characterName = name
+        self.client = client
+        self.accessToken = accessToken
+        self.refreshToken = refreshToken
+
+    @reconstructor
+    def init(self):
+        pass
+
+    def get_sso_data(self):
+        """ Little "helper" function to get formated data for esipy security
+        """
+        return {
+            'access_token': self.accessToken,
+            'refresh_token': self.refreshToken,
+            'expires_in': (
+                self.accessTokenExpires - datetime.utcnow()
+            ).total_seconds()
+        }
+
+    def update_token(self, tokenResponse):
+        """ helper function to update token data from SSO response """
+        self.accessToken = tokenResponse['access_token']
+        self.accessTokenExpires = datetime.fromtimestamp(
+            time.time() + tokenResponse['expires_in'],
+        )
+        if 'refresh_token' in tokenResponse:
+            self.refreshToken = tokenResponse['refresh_token']
+        if self.esi_client is not None:
+            self.esi_client.security.update_token(tokenResponse)