remotivelabs-cli 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

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()
 

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

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.dist-info → remotivelabs_cli-0.3.3.dist-info}/METADATA

@@ -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.dist-info → remotivelabs_cli-0.3.3.dist-info}/RECORD

@@ -19,8 +19,8 @@ cli/broker/signals.py,sha256=1xldsY3SVcVp-EEsrd6_uoBjrTRMSEONHpOA6SmWxJ4,8245
 cli/cloud/__init__.py,sha256=xFaDg2zho_glvDBDB0_8HRNICVwHeYFEz-yMhzTcCjI,987
 cli/cloud/auth/__init__.py,sha256=MtQ01-n8CgZb9Y_SvxwZUgj44Yo0dFAU3_XwhQiUYtw,54
 cli/cloud/auth/cmd.py,sha256=lv9D0Q7G1RgI2IO1vkz_VVBA_STCPmdJax3QkeiMwg4,3968
-cli/cloud/auth/login.py,sha256=3kc9L6-HOBwzf4Fxis2SBm_q5ObTuzSn4Ic_GkLF0Jk,11121
-cli/cloud/auth_tokens.py,sha256=ExIsCmzoM_MCaYQ5aL4j0Cdyq81IFJ4HJAt-zn1H2L4,5061
+cli/cloud/auth/login.py,sha256=s_VdOunFLFWVl68sGTJgaJNksQquYGTfm5pJ6mBbEx0,10321
+cli/cloud/auth_tokens.py,sha256=Tj6-fMkOGjT_XHU8m8nMQcIj55MaLwqfedv15yKsYp0,5225
 cli/cloud/brokers.py,sha256=cXYKm_-CYJZH0muXAPwUMKIiqBiW6Y9WG5kmkQb3FuU,3849
 cli/cloud/configs.py,sha256=atInBsh16woPmjC0dpnRTpbY4WRgseBOWe8VwpqwO_o,3745
 cli/cloud/licenses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,12 +63,12 @@ cli/topology/start_trial.py,sha256=GNB2E-Ia18UpXQZ4fViGq5-pRq69vinDBLwzImsz2GY,3
 cli/typer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/typer/typer_utils.py,sha256=eUrVOEOKY_MnfiJMAxvEurP1Q79z9pq83mJjocP8lhI,686
 cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/utils/console.py,sha256=-IczptBi42GdgNRQAYbgFvSV-lIgVF749H9xNgSMgOo,1740
+cli/utils/console.py,sha256=JF39S9oS1lehFexjdLQKp17oINNvFZJLg_M2SDCjkvA,1754
 cli/utils/rest_helper.py,sha256=ZHc7TMNVa07kJWDQ_OEoeaGhzYu8BinSXJJX8R_wX_8,14135
 cli/utils/time.py,sha256=TEKcNZ-pQoJ7cZ6hQmVD0sTRwRm2rBy51-MuDNdO4S4,296
 cli/utils/versions.py,sha256=mHs_BCk0-wwPfCHIIQBlpFkgipSWkw9jUaZ-USH8ODY,3824
-remotivelabs_cli-0.3.1.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.3.1.dist-info/METADATA,sha256=8RommjeI-h_CqdlUXy3oSdYCPZFUCRhP2xciLRgddFk,1521
-remotivelabs_cli-0.3.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-remotivelabs_cli-0.3.1.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.3.1.dist-info/RECORD,,
+remotivelabs_cli-0.3.3.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.3.3.dist-info/METADATA,sha256=0FN9scMQxaaw_VeK_-S0WwLtDhCRqaprK9IG67O9GMM,1521
+remotivelabs_cli-0.3.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+remotivelabs_cli-0.3.3.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.3.3.dist-info/RECORD,,