Skip _db prefix on /_open/auth (#374)

* Updating example version

* No longer use _db/... prefix on /_open/auth

* Fixing test dependant on version

Author: apetenchea

arango/connection.py

@@ -125,14 +125,22 @@ def prep_response(self, resp: Response, deserialize: bool = True) -> Response:
         return resp
 
     def process_request(
-        self, host_index: int, request: Request, auth: Optional[Tuple[str, str]] = None
+        self,
+        host_index: int,
+        request: Request,
+        auth: Optional[Tuple[str, str]] = None,
+        skip_db_prefix: bool = False,
     ) -> Response:
         """Execute a request until a valid response has been returned.
 
         :param host_index: The index of the first host to try
         :type host_index: int
         :param request: HTTP request.
         :type request: arango.request.Request
+        :param auth: HTTP basic authentication tuple (username, password).
+        :type auth: tuple[str, str] | None
+        :param skip_db_prefix: Skip the database prefix in the URL.
+        :type skip_db_prefix: bool
         :return: HTTP response.
         :rtype: arango.response.Response
         """
@@ -152,11 +160,16 @@ def process_request(
             request.headers["accept-encoding"] = self._response_compression
 
         while tries < self._host_resolver.max_tries:
+            if skip_db_prefix:
+                url = self._hosts[host_index] + request.endpoint
+            else:
+                url = self._url_prefixes[host_index] + request.endpoint
+
             try:
                 resp = self._http.send_request(
                     session=self._sessions[host_index],
                     method=request.method,
-                    url=self._url_prefixes[host_index] + request.endpoint,
+                    url=url,
                     params=request.params,
                     data=data,
                     headers=request.headers,
@@ -165,7 +178,6 @@ def process_request(
 
                 return self.prep_response(resp, request.deserialize)
             except ConnectionError:
-                url = self._url_prefixes[host_index] + request.endpoint
                 logging.debug(f"ConnectionError: {url}")
 
                 if len(indexes_to_filter) == self._host_resolver.host_count - 1:
@@ -425,7 +437,7 @@ def refresh_token(self) -> None:
 
         host_index = self._host_resolver.get_host_index()
 
-        resp = self.process_request(host_index, request)
+        resp = self.process_request(host_index, request, skip_db_prefix=True)
 
         if not resp.is_success:
             raise JWTAuthError(resp, request)

starter.sh

@@ -6,7 +6,7 @@
 # Usage:
 #   ./starter.sh [single|cluster] [community|enterprise] [version]
 # Example:
-#   ./starter.sh cluster enterprise 3.12.1
+#   ./starter.sh cluster enterprise 3.12.5
 
 setup="${1:-single}"
 license="${2:-community}"

tests/test_database.py

@@ -439,18 +439,23 @@ def test_database_utf8(sys_db, special_db_names):
         assert sys_db.delete_database(name)
 
 
-def test_license(sys_db, enterprise):
+def test_license(sys_db, enterprise, db_version):
     license = sys_db.license()
     assert isinstance(license, dict)
 
-    if enterprise:
-        assert set(license.keys()) == {
+    if db_version >= version.parse("3.12.5"):
+        expected_keys = {"diskUsage", "upgrading"}
+    else:
+        expected_keys = {
             "upgrading",
             "features",
             "license",
             "version",
             "status",
         }
+
+    if enterprise:
+        assert set(license.keys()) == expected_keys
     else:
         assert license == {"license": "none"}
         with pytest.raises(ServerLicenseSetError):