dataall-cli 0.5.0__tar.gz → 0.6.0__tar.gz

{dataall_cli-0.5.0 → dataall_cli-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataall-cli
-Version: 0.5.0
+Version: 0.6.0
 Summary: AWS data.all CLI
 License: Apache-2.0
 License-File: LICENSE
@@ -18,7 +18,7 @@ Requires-Dist: atomicfile (>=1.0.1)
 Requires-Dist: boto3 (>=1.40.55)
 Requires-Dist: botocore (>=1.40.55)
 Requires-Dist: click (>=8.1.6)
-Requires-Dist: dataall-core (>=0.5.0,<0.6.0)
+Requires-Dist: dataall-core (>=0.6.0,<0.7.0)
 Requires-Dist: packaging (>=24.2)
 Requires-Dist: setuptools ; python_version >= "3.12"
 Requires-Dist: typing-extensions (>=4.4.0)

{dataall_cli-0.5.0 → dataall_cli-0.6.0}/dataall_cli/cli.py

@@ -7,6 +7,11 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 import click
+from dataall_core.auth.oidc_browser_auth import (
+    DEFAULT_FALLBACK_REDIRECT_URI,
+    DEFAULT_REDIRECT_URI,
+    DEFAULT_SCOPES,
+)
 from dataall_core.dataall_client import DataallClient
 from dataall_core.profile import CONFIG_PATH
 
@@ -52,9 +57,6 @@ bind(
 
 
 AUTH_TYPES = ["CognitoAuth", "CustomAuth", "OidcBrowserAuth"]
-DEFAULT_REDIRECT_URI = "http://localhost:8765/callback"
-DEFAULT_FALLBACK_REDIRECT_URI = "http://localhost:8766/callback"
-DEFAULT_SCOPES = "openid offline_access"
 DISCOVERED = "dataall_discovered"
 DISCOVERED_FOR = "dataall_discovered_for"
 

{dataall_cli-0.5.0 → dataall_cli-0.6.0}/dataall_cli/utils/__init__.py

@@ -1,6 +1,7 @@
 """data.all cli utils."""
 
+from dataall_core.discovery import discover_from_frontend, frontend_origin
+
 from .config import load_config, save_config
-from .discovery import discover_from_frontend, frontend_origin
 
 __all__ = ["discover_from_frontend", "frontend_origin", "load_config", "save_config"]

{dataall_cli-0.5.0 → dataall_cli-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dataall-cli"
-version = "0.5.0"
+version = "0.6.0"
 description = "AWS data.all CLI"
 authors = [{ name = "Amazon Web Services" }]
 license = { text = "Apache License 2.0" }
@@ -22,7 +22,7 @@ dependencies = [
     "atomicfile>=1.0.1",
     "PyYAML>=6.0.1",
     "setuptools; python_version >= '3.12'",
-    "dataall-core>=0.5.0,<0.6.0",
+    "dataall-core>=0.6.0,<0.7.0",
 ]
 
 [project.scripts]

dataall_cli-0.5.0/dataall_cli/utils/discovery.py

@@ -1,54 +0,0 @@
-"""Discover CLI settings from a deployed data.all front page."""
-
-import re
-from typing import Dict
-from urllib.parse import urljoin, urlparse
-
-import httpx
-
-BUNDLE_PATTERN = re.compile(r'src="([^"]*static/js/main\.[^"]+\.js)"')
-VALUE_PATTERN = re.compile(r'(REACT_APP_[A-Z_]+):"([^"]*)"')
-API_SUFFIX = "/graphql/api"
-
-
-def frontend_origin(dataall_url: str) -> str:
-    """Return ``scheme://host`` of a data.all URL."""
-    parsed = urlparse(dataall_url)
-    return f"{parsed.scheme}://{parsed.netloc}"
-
-
-def discover_from_frontend(dataall_url: str) -> Dict[str, str]:
-    """Read the auth type, identity provider, client id and API endpoint from the front page bundle.
-
-    Returns ``frontend_url`` plus whichever values were found.
-    """
-    found = {"frontend_url": frontend_origin(dataall_url)}
-    base = dataall_url.rstrip("/") + "/"
-    index = httpx.get(base, follow_redirects=True, timeout=30)
-    index.raise_for_status()
-    match = BUNDLE_PATTERN.search(index.text)
-    if not match:
-        return found
-    bundle = httpx.get(urljoin(base, match.group(1)), follow_redirects=True, timeout=60)
-    bundle.raise_for_status()
-    values = dict(VALUE_PATTERN.findall(bundle.text))
-
-    if values.get("REACT_APP_CUSTOM_AUTH") and values.get("REACT_APP_CUSTOM_AUTH_URL"):
-        found["auth_type"] = "OidcBrowserAuth"
-        found["idp_domain_url"] = values["REACT_APP_CUSTOM_AUTH_URL"]
-        if values.get("REACT_APP_CUSTOM_AUTH_CLIENT_ID"):
-            found["client_id"] = values["REACT_APP_CUSTOM_AUTH_CLIENT_ID"]
-    elif values.get("REACT_APP_COGNITO_APP_CLIENT_ID"):
-        found["auth_type"] = "CognitoAuth"
-        found["client_id"] = values["REACT_APP_COGNITO_APP_CLIENT_ID"]
-        domain = values.get("REACT_APP_COGNITO_DOMAIN", "")
-        if domain:
-            found["idp_domain_url"] = domain if "://" in domain else f"https://{domain}"
-        if values.get("REACT_APP_COGNITO_REDIRECT_SIGNIN"):
-            found["redirect_uri"] = values["REACT_APP_COGNITO_REDIRECT_SIGNIN"]
-    api = values.get("REACT_APP_GRAPHQL_API", "")
-    if api:
-        found["api_endpoint_url"] = (
-            api[: -len(API_SUFFIX)] if api.endswith(API_SUFFIX) else api
-        )
-    return found