From 9cfbb3fcbe98f719ff4e690db2c9eb1c1061fff1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 3 Mar 2022 12:18:43 +0100 Subject: [PATCH] use the correct headers --- Backend/networking/bungieApi.py | 15 +++++++++------ version.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Backend/networking/bungieApi.py b/Backend/networking/bungieApi.py index f679e08b..976ddbb5 100644 --- a/Backend/networking/bungieApi.py +++ b/Backend/networking/bungieApi.py @@ -94,6 +94,9 @@ async def get( # ignore cookies no_jar = aiohttp.DummyCookieJar() + # use the correct headers + request_headers = self.normal_headers if not with_token else self.auth_headers + try: async with aiohttp_client_cache.CachedSession( cache=self.cache, json_serialize=lambda x: orjson.dumps(x).decode(), cookie_jar=no_jar @@ -104,7 +107,7 @@ async def get( session=session, method="GET", route=route, - headers=self.normal_headers, + headers=request_headers, params=params, ) @@ -115,7 +118,7 @@ async def get( session=session, method="GET", route=route, - headers=self.normal_headers, + headers=request_headers, params=params, ) @@ -152,12 +155,12 @@ async def post(self, route: str, json: dict = None, params: dict = None) -> WebR async def __set_auth_headers(self): """Update the auth headers to include a working token. Raise an error if that doesnt exist""" - # get a working token or abort - auth = BungieAuth(db=self.db, user=self.user) - token = await auth.get_working_token() - # use special token headers if its a bungie request if self.bungie_request: + # get a working token or abort + auth = BungieAuth(db=self.db, user=self.user) + token = await auth.get_working_token() + self.auth_headers.update( { "Authorization": f"Bearer {token}", diff --git a/version.py b/version.py index 39e0411d..9fd0f8dd 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = "1.0.9" +__version__ = "1.0.10"