Append /v1 to api_url if not provided.

Author: stevenclouston

authsignal/client.py

@@ -1,4 +1,5 @@
 import decimal
+import authsignal
 from authsignal.version import VERSION
 
 import humps
@@ -9,8 +10,7 @@
 
 _UNICODE_STRING = str
 
-API_BASE_URL = 'https://signal.authsignal.com'
-API_CHALLENGE_URL = 'https://api.authsignal.com/v1'
+API_BASE_URL = 'https://api.authsignal.com/v1'
 
 BLOCK = "BLOCK"
 ALLOW = "ALLOW"
@@ -52,8 +52,8 @@ def __init__(
         self.url = api_url
         self.timeout = timeout
         self.version = version
+        self.api_version = 'v1'
 
-    
     def track(self, user_id, action, payload=None, path=None):
         """Tracks an action to authsignal, scoped to the user_id and action
         Returns the status of the action so that you can determine to whether to continue
@@ -236,7 +236,7 @@ def enroll_verified_authenticator(self, user_id, authenticator_payload,  path=No
             raise ApiException(str(e), path) from e
 
     def validate_challenge(self, token: str, user_id: Optional[str] = None, action: Optional[str] = None) -> Dict[str, Any]:
-        path = f"{API_CHALLENGE_URL}/validate"
+        path = self._validate_challenge_url()
         headers = {
             'Content-Type': 'application/json',
             'Accept': 'application/json'
@@ -267,20 +267,34 @@ def _default_headers(self):
         return {'Content-type': 'application/json',
                 'Accept': '*/*',
                 'User-Agent': self._user_agent()}
+
     def _user_agent(self):
         return f'Authsignal Python v{self.version}'
 
     def _track_url(self, user_id, action):
-        return f'{self.url}/v1/users/{user_id}/actions/{action}'
-    
+        path = self._ensure_versioned_path(f'/users/{user_id}/actions/{action}')
+        return f'{self.url}{path}'
+
     def _get_action_url(self, user_id, action, idempotency_key):
-        return f'{self.url}/v1/users/{user_id}/actions/{action}/{idempotency_key}'
-    
+        path = self._ensure_versioned_path(f'/users/{user_id}/actions/{action}/{idempotency_key}')
+        return f'{self.url}{path}'
+
     def _get_user_url(self, user_id):
-        return f'{self.url}/v1/users/{user_id}'
+        path = self._ensure_versioned_path(f'/users/{user_id}')
+        return f'{self.url}{path}'
 
     def _post_enrollment_url(self, user_id):
-        return f'{self.url}/v1/users/{user_id}/authenticators'
+        path = self._ensure_versioned_path(f'/users/{user_id}/authenticators')
+        return f'{self.url}{path}'
+    
+    def _validate_challenge_url(self):
+        path = self._ensure_versioned_path(f'/validate')
+        return f'{self.url}{path}'
+
+    def _ensure_versioned_path(self, path):
+        if not self.url.endswith(f'/{self.api_version}'):
+            return f'/{self.api_version}{path}'
+        return path
 
 class ApiException(Exception):
     def __init__(self, message, url, http_status_code=None, body=None, api_status=None,
@@ -311,4 +325,3 @@ def _assert_non_empty_dict(val, name):
         raise TypeError('{0} must be a non-empty dict'.format(name))
     elif not val:
         raise ValueError('{0} must be a non-empty dict'.format(name))
-