doploy-cli 0.2.5__tar.gz → 0.2.6__tar.gz

{doploy_cli-0.2.5 → doploy_cli-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.5
+Version: 0.2.6
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io

{doploy_cli-0.2.5 → doploy_cli-0.2.6}/doploy_cli/main.py

@@ -183,8 +183,12 @@ def _free_port() -> int:
         return s.getsockname()[1]
 
 
-def _wait_for_callback(port: int, state: str, timeout: float = 300.0) -> str:
-    """Serve one loopback request and return the OAuth `code` it carried."""
+def _wait_for_callback(port: int, state: str, done_url: str, timeout: float = 300.0) -> str:
+    """Serve one loopback request and return the OAuth `code` it carried.
+
+    The browser is sent on to ``done_url?status=...`` (a branded page hosted by
+    the doploy server) rather than shown bare text from this loopback server.
+    """
     from urllib.parse import parse_qs, urlparse
     result: dict = {}
 
@@ -192,15 +196,15 @@ def _wait_for_callback(port: int, state: str, timeout: float = 300.0) -> str:
         def do_GET(self):  # noqa: N802
             q = parse_qs(urlparse(self.path).query)
             if q.get('state', [''])[0] != state:
-                body, result['error'] = 'State mismatch. Close this tab and retry.', 'state mismatch'
+                status, result['error'] = 'error', 'state mismatch'
             elif q.get('error'):
-                body, result['error'] = 'Login cancelled. You can close this tab.', q['error'][0]
+                status, result['error'] = 'cancelled', q['error'][0]
             else:
-                body, result['code'] = 'Logged in to doploy. You can close this tab.', q.get('code', [''])[0]
-            self.send_response(200)
-            self.send_header('Content-Type', 'text/html')
+                status, result['code'] = 'ok', q.get('code', [''])[0]
+            self.send_response(302)
+            self.send_header('Location', f'{done_url}?status={status}')
+            self.send_header('Content-Length', '0')
             self.end_headers()
-            self.wfile.write(f'<html><body style="font-family:sans-serif"><p>{body}</p></body></html>'.encode())
 
         def log_message(self, *a):  # silence
             pass
@@ -241,7 +245,7 @@ def _browser_login(base: str) -> None:
     print('Opening your browser to sign in to doploy. If it does not open, visit:')
     print(f'  {url}')
     webbrowser.open(url)
-    code = _wait_for_callback(port, state)
+    code = _wait_for_callback(port, state, f'{issuer}/cli/complete')
 
     tok = _oauth_token_request(base, {
         'grant_type': 'authorization_code', 'code': code, 'redirect_uri': redirect_uri,

{doploy_cli-0.2.5 → doploy_cli-0.2.6}/doploy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.5
+Version: 0.2.6
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io

{doploy_cli-0.2.5 → doploy_cli-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "doploy-cli"
-version = "0.2.5"
+version = "0.2.6"
 description = "doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal"
 readme = "README.md"
 license = { text = "MIT" }