version 0.3

Author: FriendsOfGalaxy

src/http_client.py

@@ -1,6 +1,6 @@
 
 from galaxy.http import HttpClient
-
+from galaxy.api.errors import InvalidCredentials
 import aiohttp
 import logging as log
 from yarl import URL
@@ -42,7 +42,6 @@ def update_cookies(self, cookies):
     def set_auth_lost_callback(self, callback):
         self._auth_lost_callback = callback
 
-
     def get_credentials(self):
         creds = {}
         creds['cookie_jar'] = pickle.dumps([c for c in self._cookie_jar]).hex()
@@ -53,8 +52,13 @@ async def do_request(self, method, *args, **kwargs):
             return await self.request(method, *args, **kwargs)
         except Exception as e:
             log.warning(f"Request failed with {repr(e)}, attempting to refresh credentials")
-            #await self.refresh_credentials()
+        try:
+            await self.refresh_credentials()
             return await self.request(method, *args, **kwargs)
+        except Exception as e:
+            log.error(f"Refresh workflow failed with {repr(e)}")
+            self._auth_lost_callback()
+            raise InvalidCredentials()
 
     def authenticate_with_cookies(self, cookies):
         cookiez = {}
@@ -67,6 +71,15 @@ def authenticate_with_cookies(self, cookies):
         self.token = cookiez['SESSION_TOKEN']
         self._store_credentials(self.get_credentials())
 
+    async def refresh_credentials(self):
+        data = {'Authorization': f'{{"session":{{"token":"{self.token}"}}}}',
+                'content-type': 'application/json'}
+        payload = {}
+        await self.request('PUT', 'https://api.paradox-interactive.com/accounts/sessions/accounts', headers=data, json=payload)
+        for cookie in self._cookie_jar:
+            if cookie['key'] == 'SESSION_TOKEN':
+                self.token = cookie['value']
+        self._store_credentials(self.get_credentials())
 
 
 

src/plugin.py

@@ -47,16 +47,18 @@ async def authenticate(self, stored_credentials=None):
         if stored_credentials:
             stored_cookies = pickle.loads(bytes.fromhex(stored_credentials['cookie_jar']))
             self._http_client.authenticate_with_cookies(stored_cookies)
-            self.prepare_sku = asyncio.create_task(self.paradox_client.prepare_sku())
+            self._http_client.set_auth_lost_callback(self.lost_authentication)
             acc_id = await self.paradox_client.get_account_id()
+            self.prepare_sku = asyncio.create_task(self.paradox_client.prepare_sku())
             return Authentication(str(acc_id), 'Paradox')
         if not stored_credentials:
             return NextStep("web_session", AUTH_PARAMS)
 
     async def pass_login_credentials(self, step, credentials, cookies):
         self._http_client.authenticate_with_cookies(cookies)
-        self.prepare_sku = asyncio.create_task(self.paradox_client.prepare_sku())
+        self._http_client.set_auth_lost_callback(self.lost_authentication)
         acc_id = await self.paradox_client.get_account_id()
+        self.prepare_sku = asyncio.create_task(self.paradox_client.prepare_sku())
         return Authentication(str(acc_id), 'Paradox')
 
     async def get_owned_games(self):
@@ -176,10 +178,10 @@ def tick(self):
     def shutdown(self):
         asyncio.create_task(self._http_client.close())
 
-    def prepare_os_compatibility_context(self, game_ids: List[str]) -> Any:
+    async def prepare_os_compatibility_context(self, game_ids: List[str]) -> Any:
         return None
 
-    def get_os_compatibility(self, game_id: str, context: Any) -> Optional[OSCompatibility]:
+    async def get_os_compatibility(self, game_id: str, context: Any) -> Optional[OSCompatibility]:
         return OSCompatibility.Windows
 
 

src/version.py

@@ -1 +1 @@
-__version__ = "0.1"
+__version__ = "0.3"