licos-platform-cli 0.2.13__tar.gz → 0.2.14__tar.gz

{licos_platform_cli-0.2.13 → licos_platform_cli-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: licos-platform-cli
-Version: 0.2.13
+Version: 0.2.14
 Summary: LICOS platform CLI
 Requires-Python: >=3.10
 Requires-Dist: licos-platform-sdk>=0.3.0

{licos_platform_cli-0.2.13 → licos_platform_cli-0.2.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "licos-platform-cli"
-version = "0.2.13"
+version = "0.2.14"
 description = "LICOS platform CLI"
 requires-python = ">=3.10"
 dependencies = [

{licos_platform_cli-0.2.13 → licos_platform_cli-0.2.14}/src/licos_platform_cli/help_commands.py

@@ -483,10 +483,10 @@ OAUTH_HELP = {
                 {"name": "--auto-apply / --app-id", "required": True, "description": "Explicit application selection mode."},
                 {"name": "--name", "required": True, "description": "Application display name."},
                 {"name": "--login-audience", "required": True, "description": "ALL or OWNER_TENANT."},
-                {"name": "--redirect", "required": False, "description": "Optional explicit callback override; otherwise derive stable dev/prod callbacks from project runtime metadata."},
-                {"name": "--public-base-url", "required": False, "description": "Optional public LICOS OAuth2 origin override."},
+                {"name": "--redirect", "required": False, "description": "Optional explicit callback override; otherwise derive stable dev/prod callbacks from project runtime metadata."},
+                {"name": "--public-base-url", "required": False, "description": "Optional public LICOS OAuth2 origin override."},
             ],
-            "example": "licos-platform oauth configure-project --auto-apply --name 'Project login' --login-audience ALL",
+            "example": "licos-platform oauth configure-project --auto-apply --name 'Project login' --login-audience ALL",
         },
         "delete": {"description": "Delete an OAuth2 application.", "parameters": [], "example": "licos-platform oauth delete app-id"},
         "enable": {"description": "Enable an OAuth2 application.", "parameters": [], "example": "licos-platform oauth enable app-id"},

{licos_platform_cli-0.2.13 → licos_platform_cli-0.2.14}/src/licos_platform_cli/oauth_commands.py

@@ -5,7 +5,7 @@ import json
 import os
 from pathlib import Path
 from typing import Any, Callable
-from urllib.parse import quote, urlsplit, urlunsplit
+from urllib.parse import quote, urlsplit, urlunsplit
 
 from licos_platform_sdk import oauth
 
@@ -43,43 +43,43 @@ def _parse_redirect(value: str) -> dict[str, str]:
     }
 
 
-def _public_base_url(value: str) -> str:
+def _public_base_url(value: str) -> str:
     parsed = urlsplit(_parse_http_url(value, option="--public-base-url"))
     path = parsed.path.rstrip("/")
     if path.endswith("/api/v1"):
         path = path[: -len("/api/v1")]
-    return urlunsplit((parsed.scheme, parsed.netloc, path, "", "")).rstrip("/")
-
-
-def _required_env(name: str) -> str:
-    value = (os.environ.get(name) or "").strip()
-    if not value:
-        raise argparse.ArgumentTypeError(
-            f"{name} is required when --redirect is not provided"
-        )
-    return value
-
-
-def _automatic_redirects() -> list[dict[str, str]]:
-    project_id = _required_env("AGENT_PROJECT_ID")
-    encoded_project_id = quote(project_id, safe="")
-    platform_public_base = _public_base_url(_required_env("LICOS_PLATFORM_PUBLIC_BASE_URL"))
-    deploy_public_base = _public_base_url(_required_env("LICOS_DEPLOY_PUBLIC_BASE_URL"))
-    return [
-        {
-            "environment": "dev",
-            "redirectUri": (
-                f"{platform_public_base}/agent/api/v1/projects/"
-                f"{encoded_project_id}/oauth/callback"
-            ),
-        },
-        {
-            "environment": "prod",
-            "redirectUri": (
-                f"{deploy_public_base}/p/{encoded_project_id}/api/auth/licos/callback"
-            ),
-        },
-    ]
+    return urlunsplit((parsed.scheme, parsed.netloc, path, "", "")).rstrip("/")
+
+
+def _required_env(name: str) -> str:
+    value = (os.environ.get(name) or "").strip()
+    if not value:
+        raise argparse.ArgumentTypeError(
+            f"{name} is required when --redirect is not provided"
+        )
+    return value
+
+
+def _automatic_redirects() -> list[dict[str, str]]:
+    project_id = _required_env("AGENT_PROJECT_ID")
+    encoded_project_id = quote(project_id, safe="")
+    platform_public_base = _public_base_url(_required_env("LICOS_PLATFORM_PUBLIC_BASE_URL"))
+    deploy_public_base = _public_base_url(_required_env("LICOS_DEPLOY_PUBLIC_BASE_URL"))
+    return [
+        {
+            "environment": "dev",
+            "redirectUri": (
+                f"{platform_public_base}/agent-gateway/api/v1/projects/"
+                f"{encoded_project_id}/oauth/callback"
+            ),
+        },
+        {
+            "environment": "prod",
+            "redirectUri": (
+                f"{deploy_public_base}/p/{encoded_project_id}/api/auth/licos/callback"
+            ),
+        },
+    ]
 
 
 def _project_root() -> Path:
@@ -137,25 +137,25 @@ def _cmd_revoke_grant(args: argparse.Namespace) -> Any:
     return oauth.revoke_grant(args.grant_id)
 
 
-def _cmd_configure_project(args: argparse.Namespace) -> dict[str, Any]:
-    public_base_url = (
-        args.public_base_url
-        or os.environ.get("LICOS_PLATFORM_PUBLIC_BASE_URL")
-        or os.environ.get("LICOS_OAUTH_PUBLIC_BASE_URL")
-    )
-    if not public_base_url:
-        raise argparse.ArgumentTypeError(
-            "--public-base-url, LICOS_PLATFORM_PUBLIC_BASE_URL, or LICOS_OAUTH_PUBLIC_BASE_URL is required"
-        )
-    normalized_public_base_url = _public_base_url(public_base_url)
-    redirects = args.redirects or _automatic_redirects()
-    path = _config_path(args.out)
+def _cmd_configure_project(args: argparse.Namespace) -> dict[str, Any]:
+    public_base_url = (
+        args.public_base_url
+        or os.environ.get("LICOS_PLATFORM_PUBLIC_BASE_URL")
+        or os.environ.get("LICOS_OAUTH_PUBLIC_BASE_URL")
+    )
+    if not public_base_url:
+        raise argparse.ArgumentTypeError(
+            "--public-base-url, LICOS_PLATFORM_PUBLIC_BASE_URL, or LICOS_OAUTH_PUBLIC_BASE_URL is required"
+        )
+    normalized_public_base_url = _public_base_url(public_base_url)
+    redirects = args.redirects or _automatic_redirects()
+    path = _config_path(args.out)
     app = oauth.ensure_project_app(
         app_id=args.app_id,
         name=args.name,
         description=args.description,
         login_audience=args.login_audience,
-        redirect_uri_configs=redirects,
+        redirect_uri_configs=redirects,
         allowed_scopes=args.scopes or DEFAULT_SCOPES,
     )
     app_id = str(app.get("id") or "").strip()
@@ -172,7 +172,7 @@ def _cmd_configure_project(args: argparse.Namespace) -> dict[str, Any]:
         "clientId": client_id,
         "loginAudience": args.login_audience,
         "scopes": args.scopes or DEFAULT_SCOPES,
-        "redirectUriConfigs": redirects,
+        "redirectUriConfigs": redirects,
         "pkce": True,
         "publicBaseUrl": normalized_public_base_url,
         "endpoints": {
@@ -218,11 +218,11 @@ def add_oauth_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentPar
     configure.add_argument("--login-audience", required=True, choices=["ALL", "OWNER_TENANT"])
     configure.add_argument(
         "--redirect",
-        action="append",
-        dest="redirects",
-        type=_parse_redirect,
-        default=None,
-        help="Explicit callback override as dev=URL, prod=URL, or URL (defaults to prod); can repeat",
+        action="append",
+        dest="redirects",
+        type=_parse_redirect,
+        default=None,
+        help="Explicit callback override as dev=URL, prod=URL, or URL (defaults to prod); can repeat",
     )
     configure.add_argument("--scope", action="append", dest="scopes", default=None, help="OAuth2 scope; can repeat")
     configure.add_argument("--public-base-url", default=None, help="Public LICOS OAuth2 origin; /api/v1 is removed")

{licos_platform_cli-0.2.13 → licos_platform_cli-0.2.14}/tests/test_cli.py

@@ -251,7 +251,7 @@ class PlatformCliTests(unittest.TestCase):
                 allowed_scopes=["openid", "profile", "email"],
             )
 
-    def test_oauth_configure_auto_apply_uses_environment_public_base(self) -> None:
+    def test_oauth_configure_auto_apply_uses_environment_public_base(self) -> None:
         app = {
             "id": "app-2",
             "appCode": "project-project-1",
@@ -281,84 +281,84 @@ class PlatformCliTests(unittest.TestCase):
             config = json.loads((Path(tmp) / "config" / "licos-oauth.json").read_text(encoding="utf-8"))
             self.assertEqual(config["publicBaseUrl"], "https://platform.example")
             self.assertEqual(config["redirectUriConfigs"][0]["environment"], "prod")
-            self.assertIsNone(ensure.call_args.kwargs["app_id"])
-            self.assertEqual(json.loads(stdout)["selectionMode"], "auto-apply")
-
-    def test_oauth_configure_auto_generates_stable_project_callbacks(self) -> None:
-        app = {
-            "id": "app-3",
-            "appCode": "project-project-1",
-            "clientId": "client-3",
-        }
-        with tempfile.TemporaryDirectory() as tmp:
-            env = {
-                "LICOS_PROJECT_PATH": tmp,
-                "AGENT_PROJECT_ID": "project/1",
-                "LICOS_PLATFORM_PUBLIC_BASE_URL": "https://platform.example",
-                "LICOS_DEPLOY_PUBLIC_BASE_URL": "https://deploy.example",
-            }
-            with mock.patch.dict(os.environ, env, clear=False):
-                with mock.patch.object(oauth_commands.oauth, "ensure_project_app", return_value=app) as ensure:
-                    code, stdout, stderr = run_cli(
-                        "oauth",
-                        "configure-project",
-                        "--auto-apply",
-                        "--name",
-                        "Project login",
-                        "--login-audience",
-                        "ALL",
-                    )
-
-            self.assertEqual(code, 0)
-            self.assertEqual(stderr, "")
-            redirects = ensure.call_args.kwargs["redirect_uri_configs"]
-            self.assertEqual(
-                redirects,
-                [
-                    {
-                        "environment": "dev",
-                        "redirectUri": (
-                            "https://platform.example/agent/api/v1/projects/"
-                            "project%2F1/oauth/callback"
-                        ),
-                    },
-                    {
-                        "environment": "prod",
-                        "redirectUri": (
-                            "https://deploy.example/p/project%2F1/api/auth/licos/callback"
-                        ),
-                    },
-                ],
-            )
-            config = json.loads((Path(tmp) / "config" / "licos-oauth.json").read_text(encoding="utf-8"))
-            self.assertEqual(config["redirectUriConfigs"], redirects)
-            self.assertEqual(config["publicBaseUrl"], "https://platform.example")
-            self.assertEqual(json.loads(stdout)["selectionMode"], "auto-apply")
-
-    def test_oauth_configure_without_redirect_requires_stable_project_metadata(self) -> None:
-        with tempfile.TemporaryDirectory() as tmp:
-            env = {
-                "LICOS_PROJECT_PATH": tmp,
-                "LICOS_PLATFORM_PUBLIC_BASE_URL": "https://platform.example",
-                "LICOS_DEPLOY_PUBLIC_BASE_URL": "https://deploy.example",
-                "AGENT_PROJECT_ID": "",
-            }
-            with mock.patch.dict(os.environ, env, clear=False):
-                with mock.patch.object(oauth_commands.oauth, "ensure_project_app") as ensure:
-                    code, stdout, stderr = run_cli(
-                        "oauth",
-                        "configure-project",
-                        "--auto-apply",
-                        "--name",
-                        "Project login",
-                        "--login-audience",
-                        "ALL",
-                    )
-
-            self.assertEqual(code, 2)
-            self.assertEqual(stdout, "")
-            self.assertIn("AGENT_PROJECT_ID", stderr)
-            ensure.assert_not_called()
+            self.assertIsNone(ensure.call_args.kwargs["app_id"])
+            self.assertEqual(json.loads(stdout)["selectionMode"], "auto-apply")
+
+    def test_oauth_configure_auto_generates_stable_project_callbacks(self) -> None:
+        app = {
+            "id": "app-3",
+            "appCode": "project-project-1",
+            "clientId": "client-3",
+        }
+        with tempfile.TemporaryDirectory() as tmp:
+            env = {
+                "LICOS_PROJECT_PATH": tmp,
+                "AGENT_PROJECT_ID": "project/1",
+                "LICOS_PLATFORM_PUBLIC_BASE_URL": "https://platform.example",
+                "LICOS_DEPLOY_PUBLIC_BASE_URL": "https://deploy.example",
+            }
+            with mock.patch.dict(os.environ, env, clear=False):
+                with mock.patch.object(oauth_commands.oauth, "ensure_project_app", return_value=app) as ensure:
+                    code, stdout, stderr = run_cli(
+                        "oauth",
+                        "configure-project",
+                        "--auto-apply",
+                        "--name",
+                        "Project login",
+                        "--login-audience",
+                        "ALL",
+                    )
+
+            self.assertEqual(code, 0)
+            self.assertEqual(stderr, "")
+            redirects = ensure.call_args.kwargs["redirect_uri_configs"]
+            self.assertEqual(
+                redirects,
+                [
+                    {
+                        "environment": "dev",
+                        "redirectUri": (
+                            "https://platform.example/agent-gateway/api/v1/projects/"
+                            "project%2F1/oauth/callback"
+                        ),
+                    },
+                    {
+                        "environment": "prod",
+                        "redirectUri": (
+                            "https://deploy.example/p/project%2F1/api/auth/licos/callback"
+                        ),
+                    },
+                ],
+            )
+            config = json.loads((Path(tmp) / "config" / "licos-oauth.json").read_text(encoding="utf-8"))
+            self.assertEqual(config["redirectUriConfigs"], redirects)
+            self.assertEqual(config["publicBaseUrl"], "https://platform.example")
+            self.assertEqual(json.loads(stdout)["selectionMode"], "auto-apply")
+
+    def test_oauth_configure_without_redirect_requires_stable_project_metadata(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp:
+            env = {
+                "LICOS_PROJECT_PATH": tmp,
+                "LICOS_PLATFORM_PUBLIC_BASE_URL": "https://platform.example",
+                "LICOS_DEPLOY_PUBLIC_BASE_URL": "https://deploy.example",
+                "AGENT_PROJECT_ID": "",
+            }
+            with mock.patch.dict(os.environ, env, clear=False):
+                with mock.patch.object(oauth_commands.oauth, "ensure_project_app") as ensure:
+                    code, stdout, stderr = run_cli(
+                        "oauth",
+                        "configure-project",
+                        "--auto-apply",
+                        "--name",
+                        "Project login",
+                        "--login-audience",
+                        "ALL",
+                    )
+
+            self.assertEqual(code, 2)
+            self.assertEqual(stdout, "")
+            self.assertIn("AGENT_PROJECT_ID", stderr)
+            ensure.assert_not_called()
 
     def test_oauth_invalid_output_path_does_not_mutate_platform(self) -> None:
         with tempfile.TemporaryDirectory() as tmp: