remotivelabs-cli 0.3.1__tar.gz → 0.3.3__tar.gz

{remotivelabs_cli-0.3.1 → remotivelabs_cli-0.3.3}/PKG-INFO

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

{remotivelabs_cli-0.3.1 → remotivelabs_cli-0.3.3}/cli/cloud/auth/login.py

@@ -184,32 +184,9 @@ def login(headless: bool = False) -> bool:  # noqa: C901, PLR0915
     Initiate login
     """
 
-    #
-    # Check login.md flowchart for better understanding
-    #
-
-    active_token_file = settings.get_active_token_file()
-    if active_token_file:
-        # check if the active token is valid, if not, prompt user to select a new token
-        if not Rest.has_access("/api/whoami") or active_token_file.is_expired():
-            settings.clear_active_account()
-            newly_activated_token_file = _do_prompt_to_use_existing_credentials()
-            if newly_activated_token_file:
-                return True
-
-            # intentional fall through to login since we have no token
-
-    else:
-        # no active token, prompt user to select a new token
-        newly_activated_token_file = _do_prompt_to_use_existing_credentials()
-        if newly_activated_token_file:
-            return True
-
-        # intentional fall through to login since we have no token
-
-    #
-    # 2. Login in if no valid token found...
-    #
+    newly_activated_token_file = _do_prompt_to_use_existing_credentials()
+    if newly_activated_token_file:
+        return True
 
     prepare_local_webserver()
 

{remotivelabs_cli-0.3.1 → remotivelabs_cli-0.3.3}/cli/cloud/auth_tokens.py

@@ -19,7 +19,7 @@ def _prompt_choice(  # noqa: C901
 ) -> Optional[TokenFile]:
     accounts = settings.list_accounts()
 
-    table = Table("#", "Active", "Type", "Token", "Account", "Created", "Expires")
+    table = Table("#", "Active", "Type", "Token ID", "Account", "Created", "Expires")
 
     included_tokens: list[TokenFile] = []
     excluded_tokens: list[TokenFile] = []
@@ -56,6 +56,9 @@ def _prompt_choice(  # noqa: C901
             str(choice.expires),
         )
     print_unformatted(table)
+    print_unformatted(
+        ":point_right: To get the access token for your activated account, use [bold]remotive cloud auth print-access-token[/bold]"
+    )
 
     if skip_prompt:
         return None

{remotivelabs_cli-0.3.1 → remotivelabs_cli-0.3.3}/cli/utils/console.py

@@ -7,8 +7,8 @@ from typing import Any
 import grpc
 from rich.console import Console
 
-console = Console()
-err_console = Console(stderr=True)
+console = Console(soft_wrap=True)
+err_console = Console(stderr=True, soft_wrap=True)
 
 
 def print_grpc_error(error: grpc.RpcError) -> None:
@@ -48,7 +48,7 @@ def print_newline() -> None:
 
 
 def print_url(url: str) -> None:
-    console.print(url, style="bold", soft_wrap=True)
+    console.print(url, style="bold")
 
 
 def print_unformatted(message: Any) -> None:

{remotivelabs_cli-0.3.1 → remotivelabs_cli-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.3.1"
+version = "0.3.3"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"