ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 07:39:44 +03:00
Code Issues Projects Releases Wiki Activity

companion: Rename Auth.session to requests_session

Browse Source 
So as to not confuse with companion.session.
This commit is contained in:
Athanasius 2021-08-28 14:18:49 +01:00
parent bc29891cc1
commit 6968cd6c69
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contributing.md
View File

@ -247,10 +247,10 @@ from edmc_data import DEBUG_WEBSERVER_HOST, DEBUG_WEBSERVER_PORT
TARGET_URL = 'https://www.edsm.net/api-journal-v1' TARGET_URL = 'https://www.edsm.net/api-journal-v1'
if 'edsm' in debug_senders: if 'edsm' in debug_senders:
TARGET_URL = f'http://{DEBUG_WEBSERVER_HOST}:{DEBUG_WEBSERVER_PORT}/edsm' TARGET_URL = f'http://{DEBUG_WEBSERVER_HOST}:{DEBUG_WEBSERVER_PORT}/edsm'
... ...
r = this.session.post(TARGET_URL, data=data, timeout=_TIMEOUT) r = this.requests_session.post(TARGET_URL, data=data, timeout=_TIMEOUT)
``` ```
Be sure to set a URL path in the `TARGET_URL` that denotes where the data Be sure to set a URL path in the `TARGET_URL` that denotes where the data

14
companion.py
View File

@ -295,15 +295,15 @@ class Auth(object):
def __init__(self, cmdr: str) -> None: def __init__(self, cmdr: str) -> None:
self.cmdr: str = cmdr self.cmdr: str = cmdr
self.session = requests.Session() self.requests_session = requests.Session()
self.session.headers['User-Agent'] = USER_AGENT self.requests_session.headers['User-Agent'] = USER_AGENT
self.verifier: Union[bytes, None] = None self.verifier: Union[bytes, None] = None
self.state: Union[str, None] = None self.state: Union[str, None] = None
def __del__(self) -> None: def __del__(self) -> None:
"""Ensure our Session is closed if we're being deleted.""" """Ensure our Session is closed if we're being deleted."""
if self.session: if self.requests_session:
self.session.close() self.requests_session.close()
def refresh(self) -> Optional[str]: def refresh(self) -> Optional[str]:
""" """
@ -334,7 +334,7 @@ class Auth(object):
logger.debug('Attempting refresh with Frontier...') logger.debug('Attempting refresh with Frontier...')
try: try:
r = self.session.post( r = self.requests_session.post(
FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN,
data=data, data=data,
timeout=auth_timeout timeout=auth_timeout
@ -422,7 +422,7 @@ class Auth(object):
# requests_log.setLevel(logging.DEBUG) # requests_log.setLevel(logging.DEBUG)
# requests_log.propagate = True # requests_log.propagate = True
r = self.session.post( r = self.requests_session.post(
FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN, FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_TOKEN,
data=request_data, data=request_data,
timeout=auth_timeout timeout=auth_timeout
@ -430,7 +430,7 @@ class Auth(object):
data_token = r.json() data_token = r.json()
if r.status_code == requests.codes.ok: if r.status_code == requests.codes.ok:
# Now we need to /decode the token to check the customer_id against FID # Now we need to /decode the token to check the customer_id against FID
r = self.session.get( r = self.requests_session.get(
FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_DECODE, FRONTIER_AUTH_SERVER + self.FRONTIER_AUTH_PATH_DECODE,
headers={ headers={
'Authorization': f'Bearer {data_token.get("access_token", "")}', 'Authorization': f'Bearer {data_token.get("access_token", "")}',