agilicus 1.243.0__py3-none-any.whl → 1.243.1__py3-none-any.whl

agilicus/agilicus_api/api_client.py

@@ -77,7 +77,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.243.0/python'
+        self.user_agent = 'OpenAPI-Generator/1.243.1/python'
 
     def __enter__(self):
         return self

agilicus/agilicus_api/configuration.py

@@ -387,7 +387,7 @@ class Configuration(object):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 2024.03.07\n"\
-               "SDK Package Version: 1.243.0".\
+               "SDK Package Version: 1.243.1".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

agilicus/agilicus_api_README.md

@@ -4,7 +4,7 @@ Agilicus is API-first. Modern software is controlled by other software, is open,
 The `agilicus_api` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2024.03.07
-- Package version: 1.243.0
+- Package version: 1.243.1
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 

agilicus/main.py

@@ -11,6 +11,7 @@ from datetime import date, datetime
 from urllib.parse import urlparse
 from prettytable import MSWORD_FRIENDLY
 from click_shell import shell
+from appdirs import user_data_dir
 
 import click
 import click_extension
@@ -373,27 +374,65 @@ def list_orphaned_resources(ctx, **kwargs):
     garbage_collection.output_orphaned_resources(ctx, result_table)
 
 
-@cli.command(name="use-org")
+@cli.command(name="use")
 @click.pass_context
-@click.argument("organisation", default=None, shell_complete=sub_org_completion)
-def use_org(ctx, organisation):
-    org_list = orgs.query_suborgs(ctx, organisation=organisation)
-    found_org = None
-    for _org in org_list:
-        if _org["organisation"] == organisation:
-            found_org = _org
+@click.argument("organisation", default=None)
+@click.option("--org-id", default="")
+def use(ctx, org_id, organisation):
+    org_list = []
+    for org in get_saved_orgs():
+        if not org.get("organisation"):
+            continue
+        if organisation.lower() in org.get("organisation").lower():
+            org_list.append(org)
 
-    if not found_org:
-        print(f"No sub organisation found named {organisation}")
+    if not org_list:
+        print(f"no organisation named {organisation} found")
         return
 
-    org_id = found_org["id"]
-    ctx.obj["ORG_ID"] = org_id
+    if len(org_list) > 1:
+        print("multiple orgs found:")
+        for org in org_list:
+            print(org.organisation)
+        return
+
+    switch_org(org_list[0])
+
+
+def get_saved_orgs():
+    orgs_file = get_saved_orgs_path()
+    if not os.path.isfile(orgs_file):
+        return []
+    with open(orgs_file, "r") as f:
+        return json.load(f)
 
-    token = whoami.whoami(ctx, False)
-    if token:
-        ctx.obj["ORGANISATION"] = found_org
-    context.save(ctx)
+
+def get_data_dir():
+    data_dir = user_data_dir("agilicus-cli", "agilicus")
+    if not os.path.isdir(data_dir):
+        os.makedirs(data_dir, exist_ok=True)
+    return data_dir
+
+
+def get_saved_orgs_path():
+    return os.path.join(get_data_dir(), "saved-orgs")
+
+
+@cli.command()
+@click.option("--org-id", default="")
+@click.pass_context
+def save_orgs(ctx, org_id=None):
+    org_list = orgs.query(ctx, org_id=org_id, enabled=True)
+    org_list = [
+        {
+            "id": org.get("id"),
+            "subdomain": org.get("subdomain"),
+            "organisation": org.get("organisation"),
+        }
+        for org in org_list
+    ]
+    with open(get_saved_orgs_path(), "w") as f:
+        json.dump(org_list, f, default=str)
 
 
 def output_tokens_list(ctx, tokens_list):
@@ -958,6 +997,7 @@ def list_useful_orgs_(ctx, **kwargs):
 @click.option("--list-children", default=True, type=bool)
 @click.option("--enabled", default=None, type=bool)
 @click.option("--page-at-id", default=None)
+@click.option("--organisation", default=None)
 @click.option(
     "--page-size",
     type=int,
@@ -1851,13 +1891,16 @@ def _format_subtable(rows):
 
 
 @cli.command(name="list-mfa-challenge-methods")
-@click.argument("user-id", default=None)
+@click.argument("user-id", default=None, required=False)
 @click.option("--challenge-type", default=None)
 @click.option("--method-status", type=bool, default=None)
 @click.option("--method-origin", default=None)
 @click.option("--limit", default=500)
 @click.pass_context
 def list_mfa_challenge_methods(ctx, user_id, **kwargs):
+    if user_id is None:
+        user_id = tokens.introspect_self(ctx).to_dict().get("sub")
+
     methods = users.list_mfa_challenge_methods(ctx, user_id, **kwargs)
     table = PrettyTable(
         ["ID", "nickname", "challenge_type", "priority", "endpoint", "origin", "enabled"]
@@ -7845,6 +7888,15 @@ def delete_connector_proxy(ctx, **kwargs):
     connectors.delete_connector_proxy(ctx, **kwargs)
 
 
+def switch_org(org):
+    ctx = click.get_current_context()
+    ctx.obj["ORG_ID"] = org.get("id")
+    context.save_refreshable_token(ctx, tokens.RefreshableAccessToken())
+
+    ctx.obj["ORGANISATION"] = orgs.get(ctx, org.get("id"))
+    context.save(ctx)
+
+
 def main():
     trusted_certs_main.add_commands(cli)
     hosts_main.add_commands(cli)

agilicus/tokens.py

@@ -476,6 +476,9 @@ class RefreshableAccessToken:
 
     def get_token(self, ctx, refresh=None, token_refresh=None):
         token = context.get_value(ctx, "TOKEN")
+
+        if token and access.is_token_expired(token):
+            token_refresh = True
         if not token or refresh or token_refresh:
             access_token = access.get_access_token(ctx, refresh=refresh)
             token = access_token.get()

{agilicus-1.243.0.dist-info → agilicus-1.243.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.243.0
+Version: 1.243.1
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: billing
 Requires-Dist: PyJWT (>=2.6.0,<3.0.0)
+Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: babel (>=2.13.1,<3.0.0)
 Requires-Dist: certifi (>=14.05.14)
 Requires-Dist: click (>=8.0.0,<9.0.0)

{agilicus-1.243.0.dist-info → agilicus-1.243.1.dist-info}/RECORD

@@ -67,9 +67,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=uFqeet8vcAvuwiyLVVtjGesi4AnEjfD4vK
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=tpdK7VSYcMwVz-p4cogCzQ2TTEFpub8-cI_wrQL1SGg,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=F6W4KJozmJm1kcl-ZupwrUpb61A2e2UlSz7oizbsyzE,38845
+agilicus/agilicus_api/api_client.py,sha256=efSbFhnQyxU-ekF5apf1fIkk7kgyn4cN59HD2yV13zc,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=m_hg6OJsEsMp6mZ1mn9OlaTflLjrU3Jc-jvYD9gi_PA,2092
-agilicus/agilicus_api/configuration.py,sha256=NMOZtD0Q42LsX9HUEgF-ETI3LvAL2PZgX4q0icX_nAM,18447
+agilicus/agilicus_api/configuration.py,sha256=o4FpdLkTanle8tt6W1Kp29drJxBMr6Brbps3N9-G5M4,18447
 agilicus/agilicus_api/docs/APIKey.md,sha256=4cKuz4_l9HcEDnUrLwYbEnn9C2WoDayrjfrY1Ixgaf4,1747
 agilicus/agilicus_api/docs/APIKeyIntrospect.md,sha256=nJ-zkuFm3JMbWFDYYN_vYyQk1snGBtBvIxtCQxamhAU,1019
 agilicus/agilicus_api/docs/APIKeyIntrospectAuthorizationInfo.md,sha256=7RApOOLjvWQs5sw2jb25g7i3Kta1BiEY-s8VRXfppH8,725
@@ -2389,7 +2389,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=AzVXuzNNU9UiS_Rp
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=DeNX2k_DEthtH-s4anP9yZ9kqnnhmjQQln3TyrrnR3g,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=qy--opUaQ21JWZkDzK5jLTviwGemU78XvB5oX7SBeKE,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=baKOD_hKGcV4fKF2rHqf-0SMFJzh2NRqNleuxdy9ICM,2746
-agilicus/agilicus_api_README.md,sha256=OmLYHN04ZtUJvkuOwEpig7-fxkPJdJaj3yOSld9fS0g,153988
+agilicus/agilicus_api_README.md,sha256=5l-qmzgbQRdYQn3slGK8qiVGFd4yc1hRD5RnXLxfboc,153988
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=vQcpLnzrRF2PnBXbMx9ayH1X7N6z3iQD2Jw-5jK9KJE,50657
@@ -2438,7 +2438,7 @@ agilicus/labels/labels_main.py,sha256=i3HA1ZuMG6N28mwmlhAMt4N95RNpm4eDS3EVRChjRu
 agilicus/launchers.py,sha256=XRW8cO_S7HHs-Cc6_baol9AOOsuGlMto7bLcsKYk6qA,11199
 agilicus/logs.py,sha256=tS8c_sdre1Dncrl59GVGQ0L3d2jtwlVjvIMl3SHJraY,766
 agilicus/lookups.py,sha256=MNmNsKpP7Fq_poLAnL9xo_iptFilKM9ziGLyIe8VKaw,669
-agilicus/main.py,sha256=WgXC9UcKRA04Zxc-Gc1biMQQXIh9HC9r4xJOCvwmMqk,261241
+agilicus/main.py,sha256=UwgyqTVkoqDg_xUSud1JYNfu5HLz_m0AwqnGC9EYi4k,262606
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=rwTuumHWz0_QPqWNdDPPdAJRGTTNUxVw7bBkxU5a8n8,12874
@@ -2468,15 +2468,15 @@ agilicus/ssh.py,sha256=mVqMlDM2zAcUphehyz9djXjrRPSIxR1qJr2Ehvl3Rvw,2925
 agilicus/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agilicus/tests/keyring_test.py,sha256=Uwp2VS2_NffYBgHAS9bXuXnIxRoK0_VOWaaYCZKv0lg,1452
 agilicus/token_parser.py,sha256=BQUSvwOVSDtHuROrR-Kk5pW-EijMUHmfObRABEoC5po,701
-agilicus/tokens.py,sha256=x17BxvAzEvJi8KPsXh2ynCdwJoetTLtRrgqotfBORqU,16655
+agilicus/tokens.py,sha256=tnhRSKDHFpM8FHn57OADqS5RQMhVuACaC712CXPxnXQ,16742
 agilicus/transfers.py,sha256=PYr_fW7dyXNUXzi5Wp5mUjZOvU7MbRzoN-D8Omo-YSQ,1523
 agilicus/trusted_certs/trusted_certs.py,sha256=HCAvYxOA3ooaee2_KbYJd6Yt_dxDEn8hjhy1upVJUYE,7951
 agilicus/trusted_certs/trusted_certs_main.py,sha256=6dHHWXvNIcUa_nA9ptigL4Vibe4nB2wnWFTTJ8AOgXo,5155
 agilicus/users.py,sha256=cBqZwqNz_9lcEJuFL5YTUFpbN56kL0-maBlM29KWWrQ,38728
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.243.0.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.243.0.dist-info/METADATA,sha256=epubu0tWgZiugblGAl9jzEjYMmFHkYsIVEeKLxm6q9U,3782
-agilicus-1.243.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.243.0.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.243.0.dist-info/RECORD,,
+agilicus-1.243.1.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.243.1.dist-info/METADATA,sha256=x0-sU6O1HqQ0iIZlNhUpQS21pHyOiIVyKMMqFLPlIjg,3822
+agilicus-1.243.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.243.1.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.243.1.dist-info/RECORD,,