Move cli auth to header

packages/polaris/polaris/polaris/modules/api/api.py

@@ -19,13 +19,15 @@ class ApiOp:
 class ApiTarget:
     name: str
     base_url: str
-    auth: Optional[Callable[[str], str]] = None
+    headers: Optional[Callable[[], Dict[str, str]]] = None
 
     def build_url(self, path: str) -> str:
-        url = f"{self.base_url.rstrip('/')}/{path.lstrip('/')}"
-        if self.auth:
-            url = self.auth(url)
-        return url
+        return f"{self.base_url.rstrip('/')}/{path.lstrip('/')}"
+
+    def get_headers(self) -> Dict[str, str]:
+        if self.headers:
+            return self.headers()
+        return {}
 
 
 class ApiProvider:

packages/polaris/polaris/polaris/modules/api/galaxy.py

@@ -37,7 +37,7 @@ def target(self):
         return ApiTarget(
             name=PROVIDER_NAME,
             base_url=self.galaxy_root,
-            auth=self._galaxy_auth,
+            headers=self._galaxy_headers,
         )
 
     def ops(self):
@@ -65,8 +65,7 @@ def resolve_op(self, name):
             },
         )
 
-    def _galaxy_auth(self, url):
+    def _galaxy_headers(self):
         if self.galaxy_key:
-            sep = "&" if "?" in url else "?"
-            return f"{url}{sep}key={self.galaxy_key}"
-        return url
+            return {"x-api-key": self.galaxy_key}
+        return {}

packages/polaris/polaris/polaris/modules/api/generic.py

@@ -27,4 +27,5 @@ async def openapi_get(target, input, meta):
         sep = "&" if "?" in url else "?"
         url = f"{url}{sep}{urlencode(query_params)}"
 
-    return await http.request("GET", url)
+    headers = target.get_headers()
+    return await http.request("GET", url, headers=headers)