Change: Format urls properly for urllib.parse.urljoin

bananas_cli/authentication.py

@@ -89,7 +89,7 @@ async def authenticate(session, client_id, audience):
             bearer_token = f.read()
 
         session.set_header("Authorization", f"Bearer {bearer_token}")
-        status, data = await session.get("/user")
+        status, data = await session.get("user")
         if status == 200:
             return
 
@@ -102,7 +102,7 @@ async def authenticate(session, client_id, audience):
     code_challenge = base64.urlsafe_b64encode(digest).decode().rstrip("=")
 
     status, data = await session.get(
-        "/user/authorize?"
+        "user/authorize?"
         f"audience={audience}&"
         "redirect_uri=http%3A%2F%2Flocalhost%3A3977%2F&"
         "response_type=code&"

bananas_cli/commands/list_self.py

@@ -14,7 +14,7 @@
 @pass_session
 @task
 async def list_self(session):
-    status, data = await session.get("/package/self")
+    status, data = await session.get("package/self")
     if status != 200:
         log.error(f"Server returned invalid status code {status}: {data}")
         raise Exit

bananas_cli/commands/upload.py

@@ -41,7 +41,7 @@ async def upload(session, version, name, description, url, license, files):
 
     starting_part = "/".join(parts) + "/"
 
-    status, data = await session.post("/new-package", json={})
+    status, data = await session.post("new-package", json={})
     if status != 200:
         log.error(f"Server returned invalid status code {status}: {data}")
         raise Exit
@@ -61,7 +61,7 @@ async def upload(session, version, name, description, url, license, files):
     if license:
         payload["license"] = license
 
-    status, data = await session.put(f"/new-package/{upload_token}", json=payload)
+    status, data = await session.put(f"new-package/{upload_token}", json=payload)
     if status == 400:
         show_validation_errors(data)
         raise Exit
@@ -74,7 +74,7 @@ async def upload(session, version, name, description, url, license, files):
         log.info(f"Uploading {filename} ...")
         session.tus_upload(upload_token, fullpath, filename)
 
-    status, data = await session.post(f"/new-package/{upload_token}/publish", json={})
+    status, data = await session.post(f"new-package/{upload_token}/publish", json={})
     if status == 400:
         show_validation_errors(data)
         raise Exit

bananas_cli/session.py

@@ -15,8 +15,8 @@
 class Session:
     def __init__(self, api_url, tus_url):
         self.session = None
-        self.api_url = api_url
-        self.tus_url = tus_url
+        self.api_url = f"${api_url}/"
+        self.tus_url = f"${tus_url}/"
 
         self._headers = {}
 
@@ -54,7 +54,7 @@ async def put(self, url, json):
         return await self._read_response(response)
 
     def tus_upload(self, upload_token, fullpath, filename):
-        full_url = urllib.parse.urljoin(self.tus_url, "/new-package/tus/")
+        full_url = urllib.parse.urljoin(self.tus_url, "new-package/tus/")
         tus = TusClient(full_url)
 
         try: