remotivelabs-cli 0.1.0a1__tar.gz → 0.1.0a3__tar.gz

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: remotivelabs-cli
-Version: 0.1.0a1
+Version: 0.1.0a3
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/auth/cmd.py

@@ -11,7 +11,6 @@ from cli.typer import typer_utils
 from cli.utils.rest_helper import RestHelper as Rest
 
 from .. import auth_tokens
-from ..organisations import do_select_default_org
 
 HELP = """
 Manage how you authenticate with our cloud platform
@@ -33,12 +32,6 @@ def login(browser: bool = typer.Option(default=True, help="Does not automaticall
     be the same as activating a personal access key or service-account access key.
     """
     do_login(headless=not browser)
-    if settings.get_cli_config().get_active_default_organisation() is None:
-        set_default_organisation = typer.confirm(
-            "You have not set a default organisation\nWould you like to choose one now?", abort=False, default=True
-        )
-        if set_default_organisation:
-            do_select_default_org(get=False)
 
 
 @app.command()
@@ -54,15 +47,27 @@ def whoami() -> None:
 
 
 @app.command()
-def print_access_token() -> None:
+def print_access_token(
+    account: str = typer.Option(None, help="Email of the account you want to print access token for, defaults to active"),
+) -> None:
     """
-    Print current active token
+    Print current active access token or the token for the specified account
     """
-    try:
-        print(settings.get_active_token())
-    except TokenNotFoundError as e:
-        ErrorPrinter.print_hint(str(e))
-        sys.exit(1)
+    if account is None:
+        try:
+            print(settings.get_active_token())
+        except TokenNotFoundError:
+            ErrorPrinter.print_generic_error("You have no active account", exit_code=1)
+    else:
+        config = settings.get_cli_config()
+        if account in config.accounts:
+            token_name = config.accounts[account].credentials_name
+            try:
+                print(settings.get_token_file(token_name).token)
+            except TokenNotFoundError:
+                ErrorPrinter.print_generic_error(f"Token file for {account} could not be found", exit_code=1)
+        else:
+            ErrorPrinter.print_generic_error(f"No account for {account} was found", exit_code=1)
 
 
 def print_access_token_file() -> None:

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/auth/login.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import base64
 import hashlib
-import json
 import os
 import secrets
 import sys
@@ -17,9 +16,9 @@ import typer
 from rich.console import Console
 from typing_extensions import override
 
-from cli.cloud.auth_tokens import list_and_select_personal_token
+from cli.cloud.auth_tokens import do_activate, prompt_to_set_org
 from cli.errors import ErrorPrinter
-from cli.settings import TokenNotFoundError, settings
+from cli.settings import TokenFile, TokenNotFoundError, settings
 from cli.utils.rest_helper import RestHelper as Rest
 
 httpd: HTTPServer
@@ -79,6 +78,7 @@ class S(BaseHTTPRequestHandler):
                 allow_status_codes=[401, 400],
             )
             if res.status_code != 200:
+                print(res.text)
                 ErrorPrinter.print_generic_error(
                     "Failed to fetch token. Please try again, if the problem persists please reach out to support@remotivelabs.com"
                 )
@@ -88,20 +88,16 @@ class S(BaseHTTPRequestHandler):
                     )
                 )
                 sys.exit(1)
-            self.wfile.write("Successfully setup CLI, return to your terminal to continue".encode("utf-8"))
+
+            # TODO - This is written before we are done...
+            self.wfile.write(
+                """Successfully setup CLI, you may close this window now. Return to your terminal to continue""".encode("utf-8")
+            )
             access_token = res.json()["access_token"]
-            # token = tf.TokenFile(
-            #    name="CLI_login_token",
-            #    token=access_token,
-            #    created=str(datetime.datetime.now().isoformat()),
-            #    expires="unknown",
-            # )
 
             global short_lived_token  # noqa: PLW0603
             short_lived_token = access_token
 
-            # settings.add_and_activate_short_lived_cli_token(tf.dumps(token))
-            # print("Successfully logged on, you are ready to go with cli")
         else:
             if error_value == "no_consent":
                 self.wfile.write(
@@ -113,6 +109,19 @@ class S(BaseHTTPRequestHandler):
                 """.encode("utf-8")
                 )
                 ErrorPrinter.print_generic_error("You did not grant access to RemotiveCloud, login aborted")
+            elif error_value == "user_not_exists":
+                self.wfile.write(
+                    """
+                It seems like you do not have an account at RemotiveCloud with that user<br/>
+                To use RemotiveCLI you must first sign up at <a href="https://cloud.remotivelabs.com">cloud.remotivelabs.com</a>
+                and approve our agreements.<br/>
+                <br/><br/>
+                Once you are signed up, Run `remotive cloud auth login` again.
+                """.encode("utf-8")
+                )
+                ErrorPrinter.print_generic_error(
+                    "To use RemotiveCLI you must first sign up at https://cloud.remotivelabs.com and approve our agreements"
+                )
             else:
                 self.wfile.write(f"Unknown error {error_value}, please contact support@remotivelabs.com".encode("utf-8"))
                 ErrorPrinter.print_generic_error(f"Unexpected error {error_value}, please contact support@remotivelabs.com")
@@ -136,8 +145,8 @@ def create_personal_token() -> None:
     response = Rest.handle_post(
         url="/api/me/keys",
         return_response=True,
-        body=json.dumps({"alias": "roine"}),
         access_token=short_lived_token,
+        # TODO - add body with alias
     )
     token = response.json()
     email = token["account"]["email"]
@@ -150,7 +159,7 @@ def create_personal_token() -> None:
             access_token=short_lived_token,
             allow_status_codes=[400, 404],
         )
-        if res is not None and res.status_code == 200:
+        if res is not None and res.status_code == 204:
             Rest.handle_delete(
                 f"/api/me/keys/{existing_file.name}",
                 quiet=True,
@@ -163,6 +172,22 @@ def create_personal_token() -> None:
     print("Successfully logged on")
 
 
+def _do_prompt_to_use_existing_credentials() -> Optional[TokenFile]:
+    files = settings.list_personal_token_files()
+    if len(files) > 0:
+        should_select_token = typer.confirm(
+            "You have credentials available already, would you like to choose one of these instead?", default=True
+        )
+        if should_select_token:
+            token = do_activate(token_name=None)
+            # token = list_and_select_personal_token(skip_prompt=False, include_service_accounts=True)
+            if token is not None:
+                return token
+            # TODO - fix so this is not needed
+            sys.exit(0)
+    return None
+
+
 def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
     """
     Initiate login
@@ -178,18 +203,9 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
 
         if not activate_token.is_expired():
             if Rest.has_access("/api/whoami"):
-                console.print(f"You are already signed in with valid credentials that expires in {activate_token.expires_in_days()} days")
-                files = settings.list_personal_token_files()
-                if len(files) > 0:
-                    print("")
-                    console.print("You have available credentials on disk, [bold]choose one or press q to login again[/bold]")
-                    token_selected = list_and_select_personal_token(skip_prompt=False)
-                    if token_selected:
-                        return True
-                # list_and_select_personal_token(skip_prompt=True)
-                # print("")
-                # typer.confirm("Are you sure you want to login again?", abort=True)
-                # If we are here, user still wants to login
+                token = _do_prompt_to_use_existing_credentials()
+                if token is not None:
+                    return True
             else:
                 settings.clear_active_token()
                 raise TokenNotFoundError()
@@ -201,15 +217,9 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
         #
         # 2. If no token was found, let user choose an existing if exists
         #
-        files = settings.list_personal_token_files()
-        if len(files) > 0:
-            print("")
-            token_selected = list_and_select_personal_token(
-                skip_prompt=False,
-                info_message="You have available credentials on disk, choose one or press q to login again",
-            )
-            if token_selected:
-                return True
+        token = _do_prompt_to_use_existing_credentials()
+        if token is not None:
+            return True
 
     prepare_local_webserver()
 
@@ -234,7 +244,7 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
             f"&code_challenge={code_challenge}"
             f"&redirect_uri=http://localhost:{httpd.server_address[1]}"
         )
-        console.print(url, style="bold")
+        console.print(url, style="bold", soft_wrap=True)
         httpd.serve_forever()
 
     def login_headless() -> None:
@@ -251,7 +261,7 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
             f"&response_type=code"
             f"&code_challenge={code_challenge}"
         )
-        console.print(url, style="bold")
+        console.print(url, style="bold", soft_wrap=True)
 
         code = typer.prompt(
             "Once finished, enter the verification code provided in your browser",
@@ -273,17 +283,7 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
         global short_lived_token  # noqa: PLW0603
         short_lived_token = access_token
         create_personal_token()
-        # current_user = res.json()
-        # token = tf.TokenFile(
-        #    type="authorized_user",
-        #    name="CLI_login_token",
-        #    token=access_token,
-        #    created=str(datetime.datetime.now().isoformat()),
-        #    expires="unknown",
-        #    account=TokenFileUser(email=current_user["email"], uid=current_user["uid"], project=None),
-        # )
-        # settings.add_and_activate_short_lived_cli_token(tf.dumps(token))
-        # console.print("Successfully logged on, you are ready to go with cli", style="green bold")
+        prompt_to_set_org()
 
     if headless and not force_use_webserver_callback():
         login_headless()
@@ -301,17 +301,16 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0912, PLR0915
 
         if not could_open:
             print(
-                "Could not open a browser on this machine, this is likely because you are in an environment where no browser is avaialble"
+                "Could not open a browser on this machine, this is likely because you are in an environment where no browser is available"
             )
             print("")
             if force_use_webserver_callback():
                 login_with_callback_but_copy_url()
+                create_personal_token()
             else:
                 login_headless()
         else:
             httpd.serve_forever()
-
-        # Once we received our callback or code we are logged in and ready to go
-        create_personal_token()
+            create_personal_token()
 
     return True

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/auth_tokens.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Optional, Union
+from typing import List, Literal, Optional
 
 import typer
 from rich.console import Console
@@ -18,14 +18,15 @@ err_console = Console(stderr=True)
 
 app = typer_utils.create_typer()
 
+PromptType = Literal["activate", "login"]
+
 
 def _prompt_choice(  # noqa: C901, PLR0912
     choices: List[TokenFile],
     skip_prompt: bool = False,
     info_message: Optional[str] = None,
-) -> Optional[Union[TokenFile, None]]:
+) -> Optional[TokenFile]:
     accounts = settings.get_cli_config().accounts
-
     try:
         active_account = settings.get_cli_config().get_active()
     except TokenNotFoundError:
@@ -42,30 +43,25 @@ def _prompt_choice(  # noqa: C901, PLR0912
             included_tokens.append(token)
         else:
             excluded_tokens.append(token)
-    if len(excluded_tokens) > 0:
-        err_console.print("The following credentials were not included in account config and cannot be activated")
-        for token in excluded_tokens:
-            err_console.print(f" * {token.name} - {token.account.email}")
 
     if len(included_tokens) == 0:
         return None
 
-    if info_message is not None:
-        console.print(info_message)
-
     included_tokens.sort(key=lambda token: token.created, reverse=True)
 
+    active_token_index = None
     for idx, choice in enumerate(included_tokens, start=1):
+        is_active = active_account is not None and active_account.credentials_name == choice.name
+        active_token_index = idx if is_active else active_token_index
         table.add_row(
             f"[yellow]{idx}",
-            ":white_check_mark:" if active_account is not None and active_account.credentials_name == choice.name else "",
+            ":white_check_mark:" if is_active else "",
             "user" if choice.type == "authorized_user" else "sa",
             choice.name,
             f"[bold]{choice.account.email if choice.account else 'unknown'}[/bold]",
             str(choice.created),
             str(choice.expires),
         )
-
     # console.print("It seems like you have access tokens from previous login, you can select one of these instead of logging in")
     console.print(table)
 
@@ -73,7 +69,13 @@ def _prompt_choice(  # noqa: C901, PLR0912
         return None
 
     typer.echo("")
-    selection = typer.prompt(f"Enter the number(# 1-{len(included_tokens)}) of the token to select (or q to skip)")
+    if info_message is not None:
+        console.print(info_message)
+
+    selection = typer.prompt(
+        f"Enter the number(# 1-{len(included_tokens)}) of the account to select (q to quit)",
+        default=f"{active_token_index}" if active_token_index is not None else None,
+    )
 
     if selection == "q":
         return None
@@ -141,51 +143,65 @@ def activate(
         err_console.print(f":boom: [bold red] Error: [/bold red] Token with filename or name {token_name} could not be found")
 
 
+def prompt_to_set_org() -> None:
+    if settings.get_cli_config().get_active_default_organisation() is None:
+        set_default_organisation = typer.confirm(
+            "You have not set a default organization\nWould you like to choose one now?",
+            abort=False,
+            default=True,
+        )
+        if set_default_organisation:
+            do_select_default_org(get=False)
+
+
 @app.command("activate")
 def select_personal_token(
     token_name: str = typer.Argument(None, help="Name, filename or path to a credentials file"),
 ) -> None:
     """
-    Prompts user to select and activate one of the available credential files
+    Activates is setting the current active credentials to use by the CLI, this can be done by specifying a name
+    of the token or getting prompted and choosing from existing.
     """
+    do_activate(token_name)
+
+
+def do_activate(
+    token_name: Optional[str],
+) -> Optional[TokenFile]:
     if token_name is not None:
-        token_selected = True
         try:
             token_file = settings.get_token_file(token_name)
             settings.activate_token(token_file)
+            return token_file
         except TokenNotFoundError:
-            token_selected = False
             err_console.print(f":boom: [bold red] Error: [/bold red] Token with filename or name {token_name} could not be found")
+            return None
     else:
         token_files = settings.list_personal_tokens()
         token_files.extend(settings.list_service_account_tokens())
         if len(token_files) > 0:
             token_selected = list_and_select_personal_token(include_service_accounts=True)
-
-            if token_selected:
+            if token_selected is not None:
                 is_logged_in = Rest.has_access("/api/whoami")
                 if not is_logged_in:
                     ErrorPrinter.print_generic_error("Could not access RemotiveCloud with selected token")
                 else:
                     console.print("[green]Success![/green] Access to RemotiveCloud granted")
-        else:
-            ErrorPrinter.print_hint("No credentials available, login to activate credentials")
+                    # Only select default if activate was done with selection and successful
+                    # and not SA since SA cannot list available organizations
+                    if token_selected.type == "authorized_user":
+                        prompt_to_set_org()
+            return token_selected
 
-    if settings.get_cli_config().get_active_default_organisation() is None:
-        set_default_organisation = typer.confirm(
-            "You have not set a default organisation\nWould you like to choose one now?",
-            abort=False,
-            default=True,
-        )
-        if set_default_organisation:
-            do_select_default_org(get=False)
+        ErrorPrinter.print_hint("No credentials available, login to activate credentials")
+        return None
 
 
 def list_and_select_personal_token(
     skip_prompt: bool = False,
     include_service_accounts: bool = False,
     info_message: Optional[str] = None,
-) -> bool:
+) -> Optional[TokenFile]:
     personal_tokens = settings.list_personal_tokens()
 
     if include_service_accounts:
@@ -197,8 +213,8 @@ def list_and_select_personal_token(
     selected_token = _prompt_choice(personal_tokens, skip_prompt=skip_prompt, info_message=info_message)
     if selected_token is not None:
         settings.activate_token(selected_token)
-        return True
-    return False
+
+    return selected_token
 
 
 # @app.command("select-revoke")
@@ -271,15 +287,23 @@ def list_sats_files() -> None:
 
 
 @app.command(name="list")
-def list_pats_files() -> None:
+def list_pats_files(
+    accounts: bool = typer.Option(True, help="Lists all available accounts"),
+    files: bool = typer.Option(False, help="Shows all token files in config directory"),
+) -> None:
     """
     Lists available credential files on filesystem
     """
-    personal_files = settings.list_personal_token_files()
-    service_account_files = settings.list_service_account_token_files()
-    personal_files.extend(service_account_files)
-    for file in personal_files:
-        print(file)
+
+    if accounts:
+        list_and_select_personal_token(skip_prompt=True, include_service_accounts=True, info_message="hello")
+
+    if files:
+        personal_files = settings.list_personal_token_files()
+        service_account_files = settings.list_service_account_token_files()
+        personal_files.extend(service_account_files)
+        for file in personal_files:
+            print(file)
 
 
 def _revoke_and_delete_personal_token(name: str, delete: bool) -> None:

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/cloud_cli.py

@@ -7,15 +7,15 @@ from cli.utils.rest_helper import RestHelper
 app = typer_utils.create_typer()
 
 
-@app.command(help="List licenses for an organisation")
+@app.command(help="List licenses for an organization")
 def licenses(
-    organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION"),
+    organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION"),
     filter_option: str = typer.Option("all", help="all, valid, expired"),
 ) -> None:
-    RestHelper.handle_get(f"/api/bu/{organisation}/licenses", {"filter": filter_option})
+    RestHelper.handle_get(f"/api/bu/{organization}/licenses", {"filter": filter_option})
 
 
-app.add_typer(organisations.app, name="organisations", help="Manage organizations")
+app.add_typer(organisations.app, name="organizations", help="Manage organizations")
 app.add_typer(projects.app, name="projects", help="Manage projects")
 app.add_typer(auth.app, name="auth")
 app.add_typer(brokers.app, name="brokers", help="Manage cloud broker lifecycle")

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/organisations.py

@@ -8,6 +8,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from cli.errors import ErrorPrinter
 from cli.settings import settings
 from cli.typer import typer_utils
 from cli.utils.rest_helper import RestHelper
@@ -40,7 +41,7 @@ def _prompt_choice(choices: List[Organisation]) -> Optional[Organisation]:
     console.print(table)
 
     typer.echo("")
-    selection = typer.prompt(f"Enter the number(# 1-{len(choices)}) of the organisation to select (or q to quit)")
+    selection = typer.prompt(f"Enter the number(# 1-{len(choices)}) of the organization to select (or q to quit)")
 
     if selection == "q":
         return None
@@ -56,15 +57,15 @@ def _prompt_choice(choices: List[Organisation]) -> Optional[Organisation]:
 
 @app.command("default")
 def select_default_org(
-    organisation_uid: str = typer.Argument(None, help="Organisation uid or empty to select one"),
-    get: bool = typer.Option(False, help="Print current default organisation"),
+    organization_uid: str = typer.Argument(None, help="Organization uid or empty to select one"),
+    get: bool = typer.Option(False, help="Print current default organization"),
 ) -> None:
-    do_select_default_org(organisation_uid, get)
+    do_select_default_org(organization_uid, get)
 
 
 def do_select_default_org(organisation_uid: Optional[str] = None, get: bool = False) -> None:
     r"""
-    Set default organisation for the currently activated user, empty to choose from available organizations or organization uid as argument
+    Set default organization for the currently activated user, empty to choose from available organizations or organization uid as argument
 
     remotive cloud organizations default my_org \[set specific org uid]
     remotive cloud organizations default \[select one from prompt]
@@ -78,10 +79,20 @@ def do_select_default_org(organisation_uid: Optional[str] = None, get: bool = Fa
         if default_organisation is not None:
             console.print(default_organisation)
         else:
-            console.print("No default organisation set")
+            console.print("No default organization set")
     elif organisation_uid is not None:
         settings.set_default_organisation(organisation_uid)
     else:
+        account = settings.get_cli_config().get_active()
+        if account is not None:
+            token = settings.get_token_file(account.credentials_name)
+            if token.type != "authorized_user":
+                ErrorPrinter.print_hint(
+                    "You must supply the organization name as argument when using a service-account since the "
+                    "service-account is not allowed to list"
+                )
+                return
+
         r = RestHelper.handle_get("/api/bu", return_response=True)
         orgs = r.json()
         orgs = [Organisation(display_name=o["organisation"]["displayName"], uid=o["organisation"]["uid"]) for o in orgs]

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/cloud/projects.py

@@ -9,8 +9,8 @@ app = typer_utils.create_typer()
 
 
 @app.command(name="list", help="List your projects")
-def list_projects(organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION")) -> None:
-    r = Rest.handle_get(url=f"/api/bu/{organisation}/me", return_response=True)
+def list_projects(organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION")) -> None:
+    r = Rest.handle_get(url=f"/api/bu/{organization}/me", return_response=True)
     if r is None:
         return
 
@@ -27,7 +27,7 @@ def list_projects(organisation: str = typer.Option(..., help="Organisation ID",
 @app.command(name="create")
 def create_project(
     project_uid: str = typer.Argument(help="Project UID"),
-    organisation: str = typer.Option(..., help="Organisation ID", envvar="REMOTIVE_CLOUD_ORGANISATION"),
+    organization: str = typer.Option(..., help="Organization ID", envvar="REMOTIVE_CLOUD_ORGANIZATION"),
     project_display_name: str = typer.Option(default="", help="Project display name"),
 ) -> None:
     create_project_req = {
@@ -36,7 +36,7 @@ def create_project(
         "description": "",
     }
 
-    Rest.handle_post(url=f"/api/bu/{organisation}/project", body=json.dumps(create_project_req))
+    Rest.handle_post(url=f"/api/bu/{organization}/project", body=json.dumps(create_project_req))
 
 
 @app.command(name="delete")

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/errors.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import os
 import sys
+from typing import Optional
 
 import grpc
 from rich.console import Console
@@ -31,8 +34,10 @@ class ErrorPrinter:
         err_console.print(f":point_right: [bold]{message}[/bold]")
 
     @staticmethod
-    def print_generic_error(message: str) -> None:
+    def print_generic_error(message: str, exit_code: Optional[int] = None) -> None:
         err_console.print(f":boom: [bold red]Failed[/bold red]: {message}")
+        if exit_code is not None:
+            sys.exit(exit_code)
 
     @staticmethod
     def print_generic_message(message: str) -> None:

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/remotive.py

@@ -60,10 +60,10 @@ def _set_default_org_as_env() -> None:
     If not already set, take the default organisation from file and set as env
     This has to be done early before it is read
     """
-    if "REMOTIVE_CLOUD_ORGANISATION" not in os.environ:
+    if "REMOTIVE_CLOUD_ORGANIZATION" not in os.environ:
         org = settings.get_cli_config().get_active_default_organisation()
         if org is not None:
-            os.environ["REMOTIVE_CLOUD_ORGANISATION"] = org
+            os.environ["REMOTIVE_CLOUD_ORGANIZATION"] = org
 
 
 @app.callback()

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/settings/config_file.py

@@ -3,14 +3,21 @@ from __future__ import annotations
 import dataclasses
 import json
 from dataclasses import dataclass
+from json import JSONDecodeError
 from typing import Dict, Optional
 
 from dacite import from_dict
 
 
 def loads(data: str) -> ConfigFile:
-    d = json.loads(data)
-    return from_dict(ConfigFile, d)
+    try:
+        d = json.loads(data)
+        return from_dict(ConfigFile, d)
+    except JSONDecodeError as e:
+        # ErrorPrinter.print_generic_error("Invalid json format, config.json")
+        raise JSONDecodeError(
+            f"File config.json is not valid json, please edit or remove file to have it re-created ({e.msg})", pos=e.pos, doc=e.doc
+        )
 
 
 def dumps(config: ConfigFile) -> str:

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/settings/core.py

@@ -6,6 +6,7 @@ import shutil
 import stat
 import sys
 from dataclasses import dataclass
+from json import JSONDecodeError
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
@@ -103,26 +104,9 @@ class Settings:
             cli_config.set_account_field(token.account.email, organisation)
             self._write_config_file(cli_config)
         except TokenNotFoundError:
-            ErrorPrinter.print_hint("You must have an account activated in order to set default organisation")
+            ErrorPrinter.print_hint("You must have an account activated in order to set default organization")
             sys.exit(1)
 
-    # def set_default_config_as_env(self) -> None:
-    #    config = self.get_cli_config()
-    #    if config.default_organisation is not None:
-    #        if "REMOTIVE_CLOUD_ORGANISATION" not in os.environ:
-    #            os.environ["REMOTIVE_CLOUD_ORGANISATION"] = config.default_organisation
-
-    # def get_active_cli_account(self) -> Optional[Account]:
-    #    try:
-    #        token = self.get_active_token_file()
-    #        config = self.get_cli_config()
-    #        if token.account.email in config.accounts:
-    #            return config.accounts[token.account.email]
-    #        return None
-    #    except TokenNotFoundError:
-    #        ErrorPrinter.print_hint("Cannot get active config without activating account credentials first")
-    #        sys.exit(1)
-
     def get_cli_config(self) -> ConfigFile:
         try:
             return self._read_config_file()
@@ -209,7 +193,6 @@ class Settings:
         # TODO: what about the active token?
         path = self._get_token_by_name(name)[1]
         # print("Deleting", path)
-        print(path)
         return path.unlink()
 
     # def add_and_activate_short_lived_cli_token(self, token: str) -> TokenFile:
@@ -274,10 +257,11 @@ class Settings:
             # From now, user will never be None when adding a token so in this case token_file.user is never None
 
         email = email_to_safe_filename(token_file.account.email) if token_file.account is not None else "unknown"
-        file = f"{SERVICE_ACCOUNT_TOKEN_FILE_PREFIX}{email}-{token_file.name}.json"
+        file = f"{SERVICE_ACCOUNT_TOKEN_FILE_PREFIX}{token_file.name}-{email}.json"
         path = self.config_dir / file
 
         self._write_token_file(path, token_file)
+        print(f"Service account token stored at {path}")
         cli_config = self.get_cli_config()
         cli_config.init_account(email=token_file.account.email, token_name=token_file.name)
         self._write_config_file(cli_config)
@@ -324,11 +308,21 @@ class Settings:
     def _list_token_files(self, prefix: str = "") -> list[TokenFileMetadata]:
         """list all tokens with the correct prefix in the config dir, but omit files that are not token files"""
 
+        def is_valid_json(path: Path) -> bool:
+            try:
+                self._read_token_file(path)
+                return True
+            except JSONDecodeError:
+                # TODO - this should be printed but printing it here causes it to be displayed to many times
+                # err_console.print(f"File is not valid json, skipping. {path}")
+                return False
+
         def is_valid_token_file(path: Path) -> bool:
+            is_token_file = path.name.startswith(SERVICE_ACCOUNT_TOKEN_FILE_PREFIX) or path.name.startswith(PERSONAL_TOKEN_FILE_PREFIX)
             has_correct_prefix = path.is_file() and path.name.startswith(prefix)
             is_active_secret = path == self._active_secret_token_path
             is_cli_config = path == self._cli_config
-            return has_correct_prefix and not is_active_secret and not is_cli_config
+            return is_token_file and is_valid_json(path) and has_correct_prefix and not is_active_secret and not is_cli_config
 
         paths = [path for path in self.config_dir.iterdir() if is_valid_token_file(path)]
 

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/cli/utils/rest_helper.py

@@ -90,20 +90,24 @@ class RestHelper:
 
     @staticmethod
     def ensure_auth_token(quiet: bool = False, access_token: Optional[str] = None) -> None:
-        if "REMOTIVE_CLOUD_ORGANISATION" not in os.environ:
+        if "REMOTIVE_CLOUD_ORGANIZATION" not in os.environ:
             org = settings.get_cli_config().get_active_default_organisation()
             if org is not None:
-                os.environ["REMOTIVE_CLOUD_ORGANISATION"] = org
+                os.environ["REMOTIVE_CLOUD_ORGANIZATION"] = org
 
         token = None
+
         if access_token is None:
-            try:
-                token = settings.get_active_token()
-            except TokenNotFoundError:
-                if quiet:
-                    return
-                ErrorPrinter.print_hint("you are not logged in, please login using [green]remotive cloud auth login[/green]")
-                sys.exit(1)
+            if "REMOTIVE_CLOUD_ACCESS_TOKEN" in os.environ:
+                token = os.environ["REMOTIVE_CLOUD_ACCESS_TOKEN"]
+            else:
+                try:
+                    token = settings.get_active_token()
+                except TokenNotFoundError:
+                    if quiet:
+                        return
+                    ErrorPrinter.print_hint("you are not logged in, please login using [green]remotive cloud auth login[/green]")
+                    sys.exit(1)
 
         RestHelper.__headers["Authorization"] = f"Bearer {token.strip() if token is not None else access_token}"
 
@@ -167,7 +171,7 @@ class RestHelper:
                 return
             err_console.print(f":boom: [bold red]Got status code[/bold red]: {response.status_code}")
             if response.status_code == 401:
-                err_console.print("Your token has expired, please login again")
+                err_console.print("Your token is not valid or has expired, please login again or activate another account")
             else:
                 err_console.print(response.text)
             sys.exit(1)
@@ -188,7 +192,7 @@ class RestHelper:
         else:
             err_console.print(f":boom: [bold red]Got status code[/bold red]: {response.status_code}")
             if response.status_code == 401:
-                err_console.print("Your token has expired, please login again")
+                err_console.print("Your token is not valid or has expired, please login again or activate another account")
             else:
                 err_console.print(response.text)
             sys.exit(1)

{remotivelabs_cli-0.1.0a1 → remotivelabs_cli-0.1.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.1.0a1"
+version = "0.1.0a3"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"
@@ -37,6 +37,8 @@ friendlywords = "^1.1.3"
 ruff = "^0.9.3"
 mypy = "^1.13.0"
 
+# This fails on windows on github so take a look the workflow, we do manual installation of poethepoet
+# https://github.com/python-poetry/poetry/issues/10028
 [tool.poetry.requires-plugins]
 poethepoet = ">=0.34.0"