sovaria-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sovaria-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Sovaria BaaS command-line interface (sov)
 Project-URL: Homepage, https://sovaria.in
 Project-URL: Documentation, https://docs.sovaria.in/cli

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/apps/cli/src/__init__.py

@@ -1,3 +1,3 @@
 """Sovaria CLI — sov command."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/apps/cli/src/commands/login.py

@@ -7,7 +7,7 @@ Phase 1 §9 Sprint 3.2:
 
 Flow:
   1. Generate code_verifier (43-128 random chars) + code_challenge = BASE64URL(SHA-256(verifier))
-  2. Open https://{api}/oauth/authorize?response_type=code&...&code_challenge=...
+  2. Open https://{console}/cli/oauth/authorize?response_type=code&...&code_challenge=...
     3. Start a temporary HTTP callback server (configured via env variables).
   4. Exchange authorization_code + verifier for token pair.
   5. Persist tokens via auth_store.save_tokens().
@@ -33,7 +33,7 @@ import typer
 
 from apps.cli.src.utils.api_client import CLIMfaRequiredError, _apply_login_response
 from apps.cli.src.utils.auth_store import clear_mfa_pending, clear_tokens, load_mfa_pending, load_tokens, save_tokens
-from apps.cli.src.utils.config import get_api_url
+from apps.cli.src.utils.config import get_api_url, get_console_url
 
 app = typer.Typer()
 
@@ -240,7 +240,7 @@ def _pkce_login(api_url: str, *, profile: str | None = None) -> None:
     state = secrets.token_hex(16)
     redirect_uri = _redirect_uri()
 
-    auth_url = f"{api_url}/oauth/authorize?" + urlencode(
+    auth_url = f"{get_console_url(profile)}/cli/oauth/authorize?" + urlencode(
         {
             "response_type": "code",
             "client_id": "sovaria-cli",

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/apps/cli/src/utils/config.py

@@ -30,6 +30,8 @@ from typing import Any, cast
 import yaml  # PyYAML
 
 _CONFIG_FILE = Path.home() / ".sovaria" / "config.yaml"
+DEFAULT_CLOUD_API_URL = "https://api.sovaria.in"
+_DEFAULT_LOCAL_API_URL = "http://localhost:8000"
 _DEFAULT_API_URL = os.getenv("SOVARIA_CLI_DEFAULT_API_URL", "").strip()
 _DEFAULT_STAGING_API_URL = os.getenv("SOVARIA_CLI_STAGING_API_URL", "").strip()
 _DEFAULT_PROD_API_URL = os.getenv("SOVARIA_CLI_PROD_API_URL", "").strip()
@@ -66,6 +68,27 @@ def _expand_env(val: str) -> str:
     return re.sub(r"\$\{([^}]+)\}", _replace, val)
 
 
+def _profile_env_default(profile: str) -> str:
+    if profile == "prod":
+        return _DEFAULT_PROD_API_URL or DEFAULT_CLOUD_API_URL
+    if profile == "staging":
+        return _DEFAULT_STAGING_API_URL or DEFAULT_CLOUD_API_URL
+    return _DEFAULT_API_URL or DEFAULT_CLOUD_API_URL
+
+
+def get_console_url(profile: str | None = None) -> str:
+    """Console origin used for browser OAuth (PKCE) flows."""
+    explicit = os.getenv("SOVARIA_CLI_CONSOLE_URL", "").strip()
+    if explicit:
+        return explicit.rstrip("/")
+
+    api_url = get_api_url(profile)
+    if "://api." in api_url:
+        return api_url.replace("://api.", "://console.", 1).rstrip("/")
+
+    return "https://console.sovaria.in"
+
+
 def get_api_url(profile: str | None = None) -> str:
     cfg = _load_yaml()
     prof = profile or get_active_profile()
@@ -77,11 +100,9 @@ def get_api_url(profile: str | None = None) -> str:
     if should_save and _CONFIG_FILE.exists():
         _save_yaml(cfg)
     raw = cast(str, entry.get("api_url", "")).strip()
-    api_url = _expand_env(raw) if raw else _DEFAULT_API_URL
+    api_url = _expand_env(raw) if raw else _profile_env_default(prof)
     if api_url:
-        return api_url
-    if _DEFAULT_API_URL:
-        return _DEFAULT_API_URL
+        return api_url.rstrip("/")
     raise ValueError(
         "API URL is not configured. Set it in ~/.sovaria/config.yaml or "
         "SOVARIA_CLI_DEFAULT_API_URL."
@@ -166,18 +187,18 @@ def write_default_config() -> None:
     _CONFIG_FILE.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
     default = {
         "version": _SCHEMA_VERSION,
-        "default_profile": "dev",
+        "default_profile": "prod",
         "profiles": {
             "dev": {
-                "api_url": _DEFAULT_API_URL,
+                "api_url": _DEFAULT_API_URL or _DEFAULT_LOCAL_API_URL,
                 "scope": {"org_id": "", "project_id": "", "env_id": ""},
             },
             "staging": {
-                "api_url": _DEFAULT_STAGING_API_URL,
+                "api_url": _DEFAULT_STAGING_API_URL or DEFAULT_CLOUD_API_URL,
                 "scope": {"org_id": "", "project_id": "", "env_id": ""},
             },
             "prod": {
-                "api_url": _DEFAULT_PROD_API_URL,
+                "api_url": _DEFAULT_PROD_API_URL or DEFAULT_CLOUD_API_URL,
                 "scope": {"org_id": "", "project_id": "", "env_id": ""},
             },
         },

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/apps/cli/tests/test_config_profiles.py

@@ -34,6 +34,24 @@ def test_get_api_url_upgrades_unversioned_string_profile(
     assert parsed["profiles"]["dev"] == {"api_url": "http://localhost:8000"}
 
 
+def test_get_api_url_defaults_to_cloud_when_unconfigured(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path,
+) -> None:
+    config_file = tmp_path / ".sovaria" / "config.yaml"
+    monkeypatch.setattr(config, "_CONFIG_FILE", config_file)
+    monkeypatch.delenv("SOVARIA_CLI_DEFAULT_API_URL", raising=False)
+    monkeypatch.delenv("SOVARIA_CLI_PROD_API_URL", raising=False)
+
+    assert config.get_api_url("prod") == config.DEFAULT_CLOUD_API_URL
+
+
+def test_get_console_url_defaults_from_api(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    monkeypatch.setattr(config, "_CONFIG_FILE", tmp_path / "missing.yaml")
+    monkeypatch.delenv("SOVARIA_CLI_CONSOLE_URL", raising=False)
+    monkeypatch.delenv("SOVARIA_CLI_DEFAULT_API_URL", raising=False)
+    assert config.get_console_url() == "https://console.sovaria.in"
+
+
 def test_get_scope_coerces_string_profile(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/apps/cli/tests/test_main_startup.py

@@ -26,4 +26,4 @@ def test_sov_console_script_help() -> None:
     )
 
     assert result.returncode == 0
-    assert "sov version 0.2.0" in result.stdout
+    assert "sov version 0.2.2" in result.stdout

{sovaria_cli-0.2.0 → sovaria_cli-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sovaria-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "Sovaria BaaS command-line interface (sov)"
 readme = "apps/cli/README.md"
 requires-python = ">=3.11"