agilicus 1.256.3__py3-none-any.whl → 1.256.4__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.256.3/python'
+        self.user_agent = 'OpenAPI-Generator/1.256.4/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.05.06\n"\
-               "SDK Package Version: 1.256.3".\
+               "SDK Package Version: 1.256.4".\
                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.05.06
-- Package version: 1.256.3
+- Package version: 1.256.4
 - 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

@@ -67,6 +67,7 @@ from .input_helpers import (
     SubObjectInt,
     SubObjectString,
     pop_item_if_none,
+    get_org_from_input_or_ctx,
 )
 
 from .trusted_certs import trusted_certs_main
@@ -2430,30 +2431,34 @@ def get_token(ctx, **kwargs):
 
 
 @cli.command(name="create-token")
-@click.argument("user-id")
-@click.argument("org-id", type=str)
+@click.option("--user-id", default=None, required=False)
+@click.option("--org-id", default=None, required=False)
 @click.option("--role", "-r", type=click.Tuple([str, str]), multiple=True)
 @click.option("--duration", type=int, default=3600)
 @click.option("--aud", type=str, multiple=True)
 @click.option("--scope", type=str, multiple=True)
 @click.option("--inherit-session", type=bool, default=False)
+@click.option("--create-refresh-token", is_flag=True)
 @click.pass_context
-def create_token(ctx, user_id, org_id, role, duration, aud, scope, inherit_session):
+def create_token(
+    ctx, user_id, org_id, role, duration, aud, scope, inherit_session, **kwargs
+):
+    if user_id is None:
+        user_id = tokens.introspect_self(ctx).to_dict().get("sub")
+    org_id = get_org_from_input_or_ctx(ctx, org_id)
     roles = {endpoint: role_name for endpoint, role_name in role}
-    token = tokens.create_token(
+    result = tokens.create_token(
         ctx,
         user_id,
         roles,
         duration,
-        aud,
+        list(aud),
         org_id=org_id,
         scopes=scope,
         inherit_session=inherit_session,
+        **kwargs,
     )
-    if not token:
-        sys.exit(1)
-
-    print(token)
+    output_entry(ctx, result.to_dict())
 
 
 @cli.command(name="bulk-revoke-tokens")

agilicus/tokens.py

@@ -44,34 +44,27 @@ def _create_token(
     org_id=None,
     scopes=None,
     inherit_session=False,
+    create_refresh_token=None,
 ):
-    token = context.get_token(ctx)
-
-    headers = {}
-    headers["Authorization"] = "Bearer {}".format(token)
-    headers["Content-type"] = "application/json"
-
-    data = {}
-    data["sub"] = user_id
-    data["time_validity"] = {"duration": duration}
-    data["audiences"] = aud
-    data["inherit_session"] = inherit_session
+    obj = agilicus.CreateTokenRequest(
+        sub=user_id,
+        time_validity=agilicus.TimeValidity(duration=duration),
+        audiences=aud,
+        inherit_session=inherit_session,
+        org=org_id,
+    )
     if hosts:
-        data["hosts"] = hosts
-    if org_id:
-        data["org"] = org_id
+        obj.hosts = hosts
     if roles:
-        data["roles"] = roles
+        obj.roles = roles
     if scopes:
-        data["scopes"] = scopes
+        obj.scopes = scopes
+    if create_refresh_token:
+        obj.create_refresh_token = create_refresh_token
 
-    response = requests.post(
-        context.get_api(ctx) + "/v1/tokens",
-        headers=headers,
-        data=json.dumps(data),
-        verify=context.get_cacert(ctx),
-    )
-    return response
+    token = context.get_token(ctx)
+    apiclient = context.get_apiclient(ctx, token)
+    return apiclient.tokens_api.create_token(obj)
 
 
 def get_introspect(
@@ -133,13 +126,21 @@ def get_token(ctx, user_id, org_id, duration, hosts, aud):
         aud=aud,
         hosts=hosts,
         org_id=org_id,
-    ).text
+    )
 
 
 def create_token(
-    ctx, user_id, roles, duration, audiences, org_id, scopes=None, inherit_session=False
+    ctx,
+    user_id,
+    roles,
+    duration,
+    audiences,
+    org_id,
+    scopes=None,
+    inherit_session=False,
+    **kwargs,
 ):
-    result = _create_token(
+    return _create_token(
         ctx,
         user_id,
         duration,
@@ -148,11 +149,8 @@ def create_token(
         org_id=org_id,
         scopes=scopes,
         inherit_session=inherit_session,
+        **kwargs,
     )
-    if result.status_code != 200:
-        print(f"Unable to retrieve token: {result.status_code} ({result.text})")
-        return None
-    return result.text
 
 
 def _get_service_access_token(auth_doc, expiry=None):

{agilicus-1.256.3.dist-info → agilicus-1.256.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.256.3
+Version: 1.256.4
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT

{agilicus-1.256.3.dist-info → agilicus-1.256.4.dist-info}/RECORD

@@ -71,9 +71,9 @@ agilicus/agilicus_api/api/users_api.py,sha256=fkuQ5woRh2Z5cLqrsm-b8Ao-1P8kS2Tbu8
 agilicus/agilicus_api/api/users_api_mock.py,sha256=wA_xiqL3Pz3KjljKlsmf5NveLZS1FpbaKJHBp7QvarY,15411
 agilicus/agilicus_api/api/whoami_api.py,sha256=ixyg8j511oLFZDtpIp4ZcYeOK9YadcqzLal1HO9LiA0,7941
 agilicus/agilicus_api/api/whoami_api_mock.py,sha256=rlvZoWnMCqORMZBg7SOv6d3xp52kELdh6wXcCaIZ93w,346
-agilicus/agilicus_api/api_client.py,sha256=ZYpD6HQ59gw79q7XLCEknpE9J6x6vpCxP6DMRjA_DcI,38845
+agilicus/agilicus_api/api_client.py,sha256=Pd5w6EHZnR6-XShDc1y3fM8ufpDY9-lkYsid9zOOehA,38845
 agilicus/agilicus_api/apis/__init__.py,sha256=aJZD7x-umdSni6ZBr4XxzpH8pwtU9hA5LlCDxcqa1Q8,2224
-agilicus/agilicus_api/configuration.py,sha256=b__nW1Hgnl6E6Gxbde2xQ_dyqHOSs5K51tA995dAQY0,18447
+agilicus/agilicus_api/configuration.py,sha256=CQz6eIt6kQoRvmyq62VlfLx__rO0NbgI_ViG5LRPXog,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
@@ -2478,7 +2478,7 @@ agilicus/agilicus_api/test/test_x509_root_certificate.py,sha256=stj9mAu5A0xg6aOy
 agilicus/agilicus_api/test/test_x509_root_certificate_spec.py,sha256=OXOKh1By2c0ZwPLJzuTyrQFHZKjipwxomyoe9RuBqC8,2832
 agilicus/agilicus_api/test/test_x509_root_certificate_status.py,sha256=huNzk-rZWsG9I-XsMAcH63i4i4Em89P__5LshhYSLUQ,2846
 agilicus/agilicus_api/test/test_xss_settings.py,sha256=Edqz6qOhRQuG5ayMljxVJSj9Q85yrl_qBV148rq9et0,2746
-agilicus/agilicus_api_README.md,sha256=MqYgh9Wd8O7UtG49YOr1OrD_wpgz3ViMs-k503od6D0,159170
+agilicus/agilicus_api_README.md,sha256=DdVM1fMRVc8tKlflp643qG-I0oqJ1ak27PDorvg7deU,159170
 agilicus/aliases.ini,sha256=MxqiVo2f2xdUDVF1YDkNW36AIqN8hrYjlTVfraEUZXY,455
 agilicus/amq.py,sha256=yxi-YTbJPVl10s78Hlr1dmrQR63iaSIoROGVILzFPmE,1775
 agilicus/apps.py,sha256=cq_EDY49XLg4y3kxET_whzA0mOXVGinlo0rA9GLQDxM,51082
@@ -2528,7 +2528,7 @@ agilicus/labels/labels_main.py,sha256=ptJ34mf-iVaf8ezf3RWLcpeP2O0ntezS4tqJ0ks0el
 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=NukNGAMM1jQhwxW9qVnRZ9ig1Uj-bu99slTJpg-COB8,266072
+agilicus/main.py,sha256=a4hMEkKtiPp_x-gAGowYLLnF_-XTc09LHVYJQ1esQTo,266375
 agilicus/messages.py,sha256=Ydm-VhAsK23UnYdstv_HsOybBODfui5ubKc7F8R_dsw,5187
 agilicus/metrics.py,sha256=v4rwpvqDzeNG5GKNoZ7t34X5qUgly5IW2s-kXlS2vQM,2315
 agilicus/orgs.py,sha256=H_QdlUwIqZhBXt6mi8EblwkbzaUbsmYbUcwwgFO7-co,13473
@@ -2562,15 +2562,15 @@ agilicus/service_token.py,sha256=YDVFeBe9Yv0qYvfUenwnpGHuj2x1J06YUe5A_C8L6L4,716
 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/tokens.py,sha256=qU_hL8ICcvR-yT0jQjf5sZLsmemSCh0gamyMnL7CHxM,18748
+agilicus/tokens.py,sha256=bcy-j7hnR9YlMC6VljpOuloeEoDrrqi_21JZLM086HA,18531
 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=JT7TIiUOtSFXPOdxmIVFm7ygZTH1FjsIkD9j-vjLuMM,38474
 agilicus/version.py,sha256=G9OFdL1v_4dLDfk6I6taDNypM5bbO-JHAwilsu9LYgg,23
 agilicus/whoami.py,sha256=kqghtWMgZOd2rhKmfguDwCTm6A3gNS8Kj-S2IBxBtl0,206
-agilicus-1.256.3.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
-agilicus-1.256.3.dist-info/METADATA,sha256=rNQiEN4KBx1I0Lh83azd5DEHenWQf4ZWPLi3GwFblfQ,3822
-agilicus-1.256.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-agilicus-1.256.3.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
-agilicus-1.256.3.dist-info/RECORD,,
+agilicus-1.256.4.dist-info/LICENSE.txt,sha256=Zq4tqiCroC2CVrBB_PWjapRdvpae23nljdiaSkOzUho,1061
+agilicus-1.256.4.dist-info/METADATA,sha256=jqOdzilFb2EAt520YarwWukmdn_szR3zM0wqpSolBcI,3822
+agilicus-1.256.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+agilicus-1.256.4.dist-info/entry_points.txt,sha256=a66hGozzLkHu0IewFzIMbSAhMTNTddUaA2T3_16Gb_s,51
+agilicus-1.256.4.dist-info/RECORD,,