diff --git a/atst/api_client.py b/atst/api_client.py index 5b720244..ded3f2f7 100644 --- a/atst/api_client.py +++ b/atst/api_client.py @@ -5,8 +5,10 @@ from json import dumps, loads class ApiClient(object): - def __init__(self, base_url, validate_cert=True): + def __init__(self, base_url, api_version=None, validate_cert=True): self.base_url = base_url + if api_version: + self.base_url = f'{base_url}/api/{api_version}' self.client = AsyncHTTPClient() self.validate_cert = validate_cert diff --git a/atst/app.py b/atst/app.py index 67807122..e46ab4ea 100644 --- a/atst/app.py +++ b/atst/app.py @@ -72,9 +72,9 @@ def make_deps(config): # we do not want to do SSL verify services in test and development validate_cert = ENV == 'production' return { - 'authz_client': ApiClient(config["default"]["AUTHZ_BASE_URL"], validate_cert=validate_cert), - 'authnid_client': ApiClient(config["default"]["AUTHNID_BASE_URL"], validate_cert=validate_cert), - 'requests_client': ApiClient(config["default"]["REQUESTS_QUEUE_BASE_URL"], validate_cert=validate_cert) + 'authz_client': ApiClient(config["default"]["AUTHZ_BASE_URL"], api_version='v1', validate_cert=validate_cert), + 'authnid_client': ApiClient(config["default"]["AUTHNID_BASE_URL"], api_version='v1', validate_cert=validate_cert), + 'requests_client': ApiClient(config["default"]["REQUESTS_QUEUE_BASE_URL"], api_version='v1', validate_cert=validate_cert) } diff --git a/atst/handlers/login.py b/atst/handlers/login.py index 3a141340..51f4fec5 100644 --- a/atst/handlers/login.py +++ b/atst/handlers/login.py @@ -25,7 +25,7 @@ class Login(BaseHandler): def _validate_login_token(self, token): try: response = yield self.authnid_client.post( - "/api/v1/validate", json={"token": token} + "/validate", json={"token": token} ) return response.code == 200