remotivelabs-cli 0.3.2__py3-none-any.whl → 0.3.4__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/topology/cmd.py

@@ -5,10 +5,12 @@ import typer
 from cli.topology.start_trial import (
     MissingOrganizationError,
     NoActiveAccountError,
+    NoOrganizationOrPermissionError,
     NotAuthorizedError,
     NotAuthorizedToStartTrialError,
     NotSignedInError,
     SubscriptionExpiredError,
+    get_organization_and_account,
     start_trial,
 )
 from cli.typer import typer_utils
@@ -30,12 +32,34 @@ def start_trial_cmd(  # noqa: C901
 
     You can read more at https://docs.remotivelabs.com/docs/remotive-topology.
     """
+
     try:
-        subscription = start_trial(organization)
-        if subscription.type == "trial":
-            print_generic_message(f"topology trial active, expires {subscription.end_date}")
-        elif subscription.type == "paid":
-            print_generic_message(f"you already have a topology subscription, expires {subscription.end_date or 'Never'}")
+        (valid_organization, _) = get_organization_and_account(organization_uid=organization)
+        ok_to_start_trial = typer.confirm(
+            f"You are about to start trial of RemotiveTopology for {valid_organization.display_name}"
+            f" (uid={valid_organization.uid}), continue?",
+            default=True,
+        )
+        if not ok_to_start_trial:
+            return
+
+        (subscription, created) = start_trial(organization)
+
+        def print_start_trial_result() -> None:
+            assert subscription.type in ("trial", "paid"), f"Unexpected subscription type: {subscription.type}"
+            kind = None
+            status = None
+            if subscription.type == "trial":
+                status = "started now" if created else "is already active"
+                kind = "trial subscription"
+            elif subscription.type == "paid":
+                status = "started now" if created else "is already started"
+                kind = "subscription"
+
+            end_text = subscription.end_date or "Never"
+            print_generic_message(f"RemotiveTopology {kind} for {valid_organization.display_name} {status}, expires {end_text}")
+
+        print_start_trial_result()
 
     except NotSignedInError:
         print_generic_error(
@@ -46,7 +70,7 @@ def start_trial_cmd(  # noqa: C901
 
     except NoActiveAccountError:
         print_hint(
-            "You have not actived your account, please run [bold]remotive cloud auth activate[/bold] to choose an account"
+            "You have not activated your account, please run [bold]remotive cloud auth activate[/bold] to choose an account"
             "or [bold]remotive cloud auth login[/bold] to sign-in"
         )
         raise typer.Exit(3)
@@ -63,15 +87,25 @@ def start_trial_cmd(  # noqa: C901
         raise typer.Exit(5)
 
     except NotAuthorizedToStartTrialError as e:
-        print_generic_error(f"You are not allowed to start-trial topology in organization {e.organization}")
+        print_generic_error(f"You are not allowed to start-trial topology in organization {e.organization.display_name}.")
         raise typer.Exit(6)
 
     except SubscriptionExpiredError as e:
         if e.subscription.type == "trial":
-            print_generic_error(f"Your Topology trial expired {e.subscription.end_date}, please contact support@remotivelabs.com")
+            print_generic_error(
+                f"RemotiveTopology trial in {e.organization.display_name} expired"
+                f" {e.subscription.end_date}, please contact support@remotivelabs.com"
+            )
             raise typer.Exit(7)
 
-        print_generic_error(f"Your Topology subscription has expired {e.subscription.end_date}, please contact support@remotivelabs.com")
+        print_generic_error(
+            f"RemotiveTopology subscription in {e.organization.display_name} has expired"
+            f" {e.subscription.end_date}, please contact support@remotivelabs.com"
+        )
+        raise typer.Exit(7)
+
+    except NoOrganizationOrPermissionError as e:
+        print_generic_error(f"Organization id {e.organization} does not exist or you do not have permission to access it.")
         raise typer.Exit(7)
 
     except Exception as e:

cli/topology/start_trial.py

@@ -26,6 +26,14 @@ class NotAuthorizedError(Exception):
         self.account = account
 
 
+class NoOrganizationOrPermissionError(Exception):
+    """Raised when the user is trying to access an organization that it does not have access to or it does not exist"""
+
+    def __init__(self, account: Account, organization_uid: str):
+        self.account = account
+        self.organization = organization_uid
+
+
 class MissingOrganizationError(Exception):
     """Raised when the user has not specified an organization and no default organization is set"""
 
@@ -33,7 +41,7 @@ class MissingOrganizationError(Exception):
 class NotAuthorizedToStartTrialError(Exception):
     """Raised when the user is not authorized to start a topology trial"""
 
-    def __init__(self, account: Account, organization: str):
+    def __init__(self, account: Account, organization: Organization):
         self.account = account
         self.organization = organization
 
@@ -41,8 +49,15 @@ class NotAuthorizedToStartTrialError(Exception):
 class SubscriptionExpiredError(Exception):
     """Raised when the subscription has expired"""
 
-    def __init__(self, subscription: Subscription):
+    def __init__(self, subscription: Subscription, organization: Organization):
         self.subscription = subscription
+        self.organization = organization
+
+
+@dataclass
+class Organization:
+    uid: str
+    display_name: str
 
 
 @dataclass
@@ -67,12 +82,7 @@ class Subscription:
         )
 
 
-def start_trial(organization: str | None = None) -> Subscription:
-    """
-    Start a 30 day trial subscription for running RemotiveTopology.
-
-    # TODO: move authentication (and basic authorization) to a logged_in decorator
-    """
+def get_organization_and_account(organization_uid: str | None = None) -> tuple[Organization, Account]:
     active_account = settings.get_active_account()
     active_token_file = settings.get_active_token_file()
 
@@ -84,22 +94,41 @@ def start_trial(organization: str | None = None) -> Subscription:
     if not RestHelper.has_access("/api/whoami"):
         raise NotAuthorizedError(account=active_account)
 
-    valid_org = organization or active_account.default_organization
-    if not valid_org:
+    org_uid = organization_uid or active_account.default_organization
+    if not org_uid:
         raise MissingOrganizationError()
 
-    res = RestHelper.handle_get(f"/api/bu/{valid_org}/features/topology", return_response=True, allow_status_codes=[403, 404])
+    response = RestHelper.handle_get(f"/api/bu/{organization_uid}", return_response=True, allow_status_codes=[403, 404])
+    if response.status_code in (403, 404):
+        raise NoOrganizationOrPermissionError(account=active_account, organization_uid=org_uid)
+
+    display_name = response.json()["displayName"]
+
+    return Organization(uid=org_uid, display_name=display_name), active_account
+
+
+def start_trial(organization_uid: str | None = None) -> tuple[Subscription, bool]:
+    """
+    Start a 30 day trial subscription for running RemotiveTopology,
+    If a trial is already started in this organization, returns the existing trial instead.
+    Returns (subscription, created_now).
+    """
+
+    (organization, active_account) = get_organization_and_account(organization_uid)
+
+    res = RestHelper.handle_get(f"/api/bu/{organization.uid}/features/topology", return_response=True, allow_status_codes=[403, 404])
     if res.status_code == 403:
-        raise NotAuthorizedToStartTrialError(account=active_account, organization=valid_org)
+        raise NotAuthorizedToStartTrialError(account=active_account, organization=organization)
+
+    created_now = False
     if res.status_code == 404:
-        created = RestHelper.handle_post(f"/api/bu/{valid_org}/features/topology", return_response=True)
+        created = RestHelper.handle_post(f"/api/bu/{organization.uid}/features/topology", return_response=True)
         subscription = Subscription.from_dict(created.json())
+        created_now = True
     else:
-        # 200 OK means we already have a valid subscription
         subscription = Subscription.from_dict(res.json())
 
-    # check subscription validity
     if subscription.end_date < datetime.datetime.now().date():
-        raise SubscriptionExpiredError(subscription=subscription)
+        raise SubscriptionExpiredError(subscription=subscription, organization=organization)
 
-    return subscription
+    return subscription, created_now

{remotivelabs_cli-0.3.2.dist-info → remotivelabs_cli-0.3.4.dist-info}/METADATA

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

{remotivelabs_cli-0.3.2.dist-info → remotivelabs_cli-0.3.4.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
@@ -58,8 +58,8 @@ cli/tools/can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/tools/can/can.py,sha256=ovTqzsjJP-z9H5RiJ3f_OXMpELqM3d09JY4JfPpT3-Q,2171
 cli/tools/tools.py,sha256=jhLfrFDqkmWV3eBAzNwBf6WgDGrz7sOhgVCia36Twn8,232
 cli/topology/__init__.py,sha256=MyorYLmC2wAd_z5GdQENEYLgoCiNYgwQ16BOX93IBtI,52
-cli/topology/cmd.py,sha256=vtAw-vIJxf2dogVaqqUm8jRzUJrC7fVuov3sSV7l0sc,3101
-cli/topology/start_trial.py,sha256=GNB2E-Ia18UpXQZ4fViGq5-pRq69vinDBLwzImsz2GY,3414
+cli/topology/cmd.py,sha256=TCSwURxTmAyU4Lvu-Rk8ymPardmAARuFEn-kTckksvw,4408
+cli/topology/start_trial.py,sha256=b0PWAFS9Q67kCLq9zZ-t6vl0c3WMiF4BF4nN5yqyZ-I,4538
 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
@@ -67,8 +67,8 @@ 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.2.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
-remotivelabs_cli-0.3.2.dist-info/METADATA,sha256=QMZTstCqkjghu2nqeUb7jyHqJO3aXeKFV_lTq0Nnj4k,1521
-remotivelabs_cli-0.3.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-remotivelabs_cli-0.3.2.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
-remotivelabs_cli-0.3.2.dist-info/RECORD,,
+remotivelabs_cli-0.3.4.dist-info/LICENSE,sha256=qDPP_yfuv1fF-u7EfexN-cN3M8aFgGVndGhGLovLKz0,608
+remotivelabs_cli-0.3.4.dist-info/METADATA,sha256=ROqIXVSgE__Tey6UbKorZorckyXtHcvSRc21IeMQqEE,1521
+remotivelabs_cli-0.3.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+remotivelabs_cli-0.3.4.dist-info/entry_points.txt,sha256=lvDhPgagLqW_KTnLPCwKSqfYlEp-1uYVosRiPjsVj10,45
+remotivelabs_cli-0.3.4.dist-info/RECORD,,