Combined PR to fix issues #3, #4, #5 and PR #20

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
 *.pyc
+.env/

bananas_cli/authentication.py

@@ -26,6 +26,7 @@ class Authenticate:
     session = None
     token_filename = None
     success = False
+    client_id = None
 
     @staticmethod
     @routes.get("/")
@@ -35,7 +36,7 @@ async def callback(request):
             status, data = await Authenticate.session.post(
                 "/user/token",
                 json={
-                    "client_id": "ape",
+                    "client_id": Authenticate.client_id,
                     "redirect_uri": "http://localhost:3977/",
                     "code_verifier": Authenticate.code_verifier,
                     "code": code,
@@ -78,7 +79,7 @@ async def wait_for_code():
             raise Exit
 
 
-async def authenticate(session, client_id):
+async def authenticate(session, client_id, audience):
     config_folder = click.get_app_dir("bananas-cli")
     os.makedirs(config_folder, exist_ok=True)
     token_filename = config_folder + "/token"
@@ -88,20 +89,21 @@ async def authenticate(session, client_id):
             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
 
     Authenticate.token_filename = token_filename
     Authenticate.session = session
     Authenticate.code_verifier = secrets.token_hex(32)
+    Authenticate.client_id = client_id
 
     digest = hashlib.sha256(Authenticate.code_verifier.encode()).digest()
     code_challenge = base64.urlsafe_b64encode(digest).decode().rstrip("=")
 
     status, data = await session.get(
-        "/user/authorize?"
-        "audience=github&"
+        "user/authorize?"
+        f"audience={audience}&"
         "redirect_uri=http%3A%2F%2Flocalhost%3A3977%2F&"
         "response_type=code&"
         f"client_id={client_id}&"

bananas_cli/cli.py

@@ -1,9 +1,11 @@
 import click
 import logging
 
+from aiohttp.client_exceptions import ClientConnectorError
 from .authentication import authenticate
 from .helpers import task
 from .session import Session
+from .exceptions import Exit
 
 log = logging.getLogger(__name__)
 pass_session = click.make_pass_decorator(Session)
@@ -18,16 +20,18 @@
 )
 @click.option("--tus-url", help="BaNaNaS tus URL. (normally the same as --api-url)", metavar="URL")
 @click.option("--client-id", help="Client-id to use for authentication", default="ape", show_default=True)
+@click.option("--audience", help="Audience to use for authentication", default="github", show_default=False)
+@click.option("--verbose", help="Enable verbose output for errors, showing tracebacks", is_flag=True)
 @click.pass_context
 @task
-async def cli(ctx, api_url, tus_url, client_id):
+async def cli(ctx, api_url, tus_url, client_id, audience, verbose):
     """
     A CLI tool to list, upload, and otherwise modify BaNaNaS content.
 
     Every option can also be set via an environment variable prefixed with
     BANANAS_CLI_; for example:
 
-    BANANAS_CLI_API_URL="http://localhost:8000" python -m bananas_clie
+    BANANAS_CLI_API_URL="http://localhost:8000" python -m bananas_cli
     """
 
     global session
@@ -39,11 +43,23 @@ async def cli(ctx, api_url, tus_url, client_id):
     if not tus_url:
         tus_url = api_url
 
-    session = Session(api_url, tus_url)
+    session = Session(api_url, tus_url, verbose)
     ctx.obj = session
 
     await session.start()
-    await authenticate(session, client_id)
+
+    os_args = click.get_os_args()
+    if "-h" in os_args or "--help" in os_args:
+        return
+
+    try:
+        await authenticate(session, client_id, audience)
+    except (ClientConnectorError, NameError) as e:
+        if verbose:
+            log.exception(e)
+        else:
+            log.error(e)
+        raise Exit
 
 
 @task

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

@@ -28,6 +28,9 @@ def show_validation_errors(data):
 @pass_session
 @task
 async def upload(session, version, name, description, url, license, files):
+    if len(files) == 0:
+        log.error("No files specified for upload")
+        return
     parts = files[0].split("/")[:-1]
     for filename in files:
         check_parts = filename.split("/")
@@ -41,7 +44,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 +64,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 +77,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

@@ -1,5 +1,6 @@
 import aiohttp
 import logging
+import urllib.parse
 
 from tusclient.client import TusClient
 from tusclient.exceptions import TusCommunicationError
@@ -12,12 +13,13 @@
 
 
 class Session:
-    def __init__(self, api_url, tus_url):
+    def __init__(self, api_url, tus_url, verbose):
         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 = {}
+        self.verbose = verbose
 
     async def start(self):
         self.session = aiohttp.ClientSession()
@@ -27,6 +29,8 @@ async def stop(self):
 
     async def _read_response(self, response):
         if response.status in (200, 201, 400, 404):
+            if response.content_type == "text/html":
+                return 302, response.url
             data = await response.json()
         elif response.status in (301, 302):
             data = response.headers["Location"]
@@ -36,31 +40,36 @@ async def _read_response(self, response):
         return response.status, data
 
     async def get(self, url):
-        response = await self.session.get(f"{self.api_url}{url}", headers=self._headers, allow_redirects=False)
+        full_url = urllib.parse.urljoin(self.api_url, url)
+        response = await self.session.get(full_url, headers=self._headers, allow_redirects=False)
         return await self._read_response(response)
 
     async def post(self, url, json):
-        response = await self.session.post(
-            f"{self.api_url}{url}", json=json, headers=self._headers, allow_redirects=False
-        )
+        full_url = urllib.parse.urljoin(self.api_url, url)
+        response = await self.session.post(full_url, json=json, headers=self._headers, allow_redirects=False)
         return await self._read_response(response)
 
     async def put(self, url, json):
-        response = await self.session.put(
-            f"{self.api_url}{url}", json=json, headers=self._headers, allow_redirects=False
-        )
+        full_url = urllib.parse.urljoin(self.api_url, url)
+        response = await self.session.put(full_url, json=json, headers=self._headers, allow_redirects=False)
         return await self._read_response(response)
 
     def tus_upload(self, upload_token, fullpath, filename):
-        tus = TusClient(f"{self.tus_url}/new-package/tus/")
+        full_url = urllib.parse.urljoin(self.tus_url, "new-package/tus/")
+        tus = TusClient(full_url)
 
         try:
             uploader = tus.uploader(
-                fullpath, chunk_size=UPLOAD_CHUNK_SIZE, metadata={"filename": filename, "upload-token": upload_token}
+                fullpath,
+                chunk_size=UPLOAD_CHUNK_SIZE,
+                metadata={"filename": filename, "upload-token": upload_token},
             )
             uploader.upload()
-        except TusCommunicationError:
-            log.exception(f"Failed to upload file '{filename}'")
+        except TusCommunicationError as e:
+            if self.verbose:
+                log.exception(f"Failed to upload file '{filename}'")
+            else:
+                log.error(f"Failed to upload file '{filename}': {e}")
             raise Exit
 
     def set_header(self, header, value):