diff --git a/companion.py b/companion.py index 455bb07d..0497ec2c 100644 --- a/companion.py +++ b/companion.py @@ -237,7 +237,8 @@ class Auth(object): # Obtain from https://auth.frontierstore.net/client/signup CLIENT_ID = os.getenv('CLIENT_ID') or 'fb88d428-9110-475f-a3d2-dc151c2b9c7a' - FRONTIER_AUTH_PATH = '/auth' + FRONTIER_PATH_AUTH = '/auth' + FRONTIER_PATH_TOKEN = '/token' def __init__(self, cmdr: str) -> None: self.cmdr: str = cmdr @@ -280,7 +281,7 @@ class Auth(object): logger.debug('Attempting refresh with Frontier...') try: - r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=data, timeout=auth_timeout) if r.status_code == requests.codes.ok: data = r.json() tokens[idx] = data.get('refresh_token', '') @@ -310,7 +311,7 @@ class Auth(object): logger.info(f'Trying auth from scratch for Commander "{self.cmdr}"') challenge = self.base64_url_encode(hashlib.sha256(self.verifier).digest()) webbrowser.open( - f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_AUTH_PATH}?response_type=code' + f'{FRONTIER_AUTH_SERVER}{self.FRONTIER_PATH_AUTH}?response_type=code' f'&audience=frontier,steam,epic' f'&scope=auth capi' f'&client_id={self.CLIENT_ID}' @@ -364,7 +365,7 @@ class Auth(object): # requests_log.setLevel(logging.DEBUG) # requests_log.propagate = True - r = self.session.post(FRONTIER_AUTH_SERVER + URL_TOKEN, data=request_data, timeout=auth_timeout) + r = self.session.post(FRONTIER_AUTH_SERVER + self.FRONTIER_PATH_TOKEN, data=request_data, timeout=auth_timeout) data_token = r.json() if r.status_code == requests.codes.ok: # Now we need to /decode the token to check the customer_id against FID @@ -477,7 +478,6 @@ class Session(object): """Methods for handling Frontier Auth and CAPI queries.""" STATE_INIT, STATE_AUTH, STATE_OK = list(range(3)) - URL_TOKEN = '/token' URL_DECODE = '/decode' def __init__(self) -> None: