PyPI - tinybird - Versions diffs - 0.0.1.dev51__tar.gz → 0.0.1.dev52__tar.gz - Mend

tinybird 0.0.1.dev51tar.gz → 0.0.1.dev52tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of tinybird might be problematic. Click here for more details.

Files changed (101) hide show

{tinybird-0.0.1.dev51 → tinybird-0.0.1.dev52}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev51
+Version: 0.0.1.dev52
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev51 → tinybird-0.0.1.dev52}/tinybird/tb/__cli__.py RENAMED Viewed

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev51'
-__revision__ = '0583356'
+__version__ = '0.0.1.dev52'
+__revision__ = '089e219'

{tinybird-0.0.1.dev51 → tinybird-0.0.1.dev52}/tinybird/tb/modules/login.py RENAMED Viewed

@@ -34,35 +34,16 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                     height: 100vh;
                     margin: 0;
                 }
-                .message {
-                    background: white;
-                    padding: 2rem 3rem;
-                    border-radius: 8px;
-                    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-                    text-align: center;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                }
-                h1 {
-                    color: #25283D;
-                    font-size: 1.2rem;
-                    margin: 0;
-                    font-weight: 500;
-                }
             </style>
         </head>
         <body>
-            <div class="message">
-                <h1>Authenticating...</h1>
-            </div>
             <script>
-                var hash = window.location.hash.substr(1);
-                var access_token = new URLSearchParams(hash).get('access_token');
-                window.history.pushState({}, '', '/');
-                fetch('/?token=' + access_token, {method: 'POST'})
+                const searchParams = new URLSearchParams(window.location.search);
+                const code = searchParams.get('code');
+                const workspace = searchParams.get('workspace');
+                fetch('/?code=' + code, {method: 'POST'})
                     .then(() => {
-                        document.querySelector('.message h1').textContent = 'Authentication successful! You can close this window.';
+                        window.location.href = "https://cloud.tinybird.co/cli-login?workspace=" + workspace;
                     });
             </script>
         </body>
@@ -73,13 +54,13 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
         parsed_path = urllib.parse.urlparse(self.path)
         query_params = urllib.parse.parse_qs(parsed_path.query)
-        if "token" in query_params:
-            token = query_params["token"][0]
-            self.server.auth_callback(token)  # type: ignore
+        if "code" in query_params:
+            code = query_params["code"][0]
+            self.server.auth_callback(code)  # type: ignore
             self.send_response(200)
             self.end_headers()
         else:
-            self.send_error(400, "Missing 'token' parameter")
+            self.send_error(400, "Missing 'code' parameter")
         self.server.shutdown()
@@ -112,12 +93,17 @@ def start_server(auth_callback):
     "--host",
     help="Set custom host if it's different than https://api.tinybird.co. See https://www.tinybird.co/docs/api-reference/overview#regions-and-endpoints for the available list of regions.",
 )
+@click.option(
+    "--auth-host",
+    default="https://cloud.tinybird.co",
+    help="Set the host to authenticate to. If unset, the default host will be used.",
+)
 @click.option(
     "--workspace",
     help="Set the workspace to authenticate to. If unset, the default workspace will be used.",
 )
 @coro
-async def login(host: str, workspace: str):
+async def login(host: str, auth_host: str, workspace: str):
     """Authenticate using the browser."""
     auth_event = threading.Event()
     auth_code = [None]  # Using a list to store the code, as it's mutable
@@ -135,30 +121,23 @@ async def login(host: str, workspace: str):
     server_thread.start()
     # Open the browser to the auth page
-    if "wadus" in host:
-        client_id = "Rpl7Uy9aSjqoPCSvHgGl3zNQuZcSOXBe"
-        base_auth_url = "https://auth.wadus1.tinybird.co"
-    else:
-        client_id = "T6excMo8IKguvUw4vFNYfqlt9pe6msCU"
-        base_auth_url = "https://auth.tinybird.co"
     callback_url = f"http://localhost:{AUTH_SERVER_PORT}"
     params = {
-        "client_id": client_id,
         "redirect_uri": callback_url,
-        "response_type": "token",
-        "scope": "openid profile email",
     }
-    auth_url = f"{base_auth_url}/authorize?{urlencode(params)}"
+    if workspace:
+        params["workspace"] = workspace
+    auth_url = f"{auth_host}/api/cli-login?{urlencode(params)}"
     webbrowser.open(auth_url)
     # Wait for the authentication to complete or timeout
     if auth_event.wait(timeout=60):  # Wait for up to 60 seconds
         params = {}
-        if workspace:
-            params["workspace_id"] = workspace
+        params["code"] = auth_code[0]
         response = requests.get(  # noqa: ASYNC210
-            f"{host}/v0/user/tokens?{urlencode(params)}",
-            headers={"Authorization": f"Bearer {auth_code[0]}"},
+            f"{auth_host}/api/cli-login?{urlencode(params)}",
         )
         data = response.json()
@@ -168,15 +147,15 @@ async def login(host: str, workspace: str):
         cli_config.set_user_token(data.get("user_token", ""))
         cli_config.set_host(host)
-        ws = await cli_config.get_client().workspace_info()
+        ws = await cli_config.get_client(token=data.get("workspace_token", "")).workspace_info()
         for k in ("id", "name", "user_email", "user_id", "scope"):
             if k in ws:
                 cli_config[k] = ws[k]
         cli_config.persist_to_file()
-        click.echo(FeedbackManager.info(message="\nWorkspace: %s" % ws["name"]))
-        click.echo(FeedbackManager.info(message="User: %s" % ws["user_email"]))
-        click.echo(FeedbackManager.info(message="Host: %s" % host))
+        click.echo(FeedbackManager.gray(message="\nWorkspace: ") + FeedbackManager.info(message=ws["name"]))
+        click.echo(FeedbackManager.gray(message="User: ") + FeedbackManager.info(message=ws["user_email"]))
+        click.echo(FeedbackManager.gray(message="Host: ") + FeedbackManager.info(message=host))
         click.echo(FeedbackManager.success(message="\n✓ Authentication successful!"))
     else:
         click.echo(FeedbackManager.error(message="Authentication failed or timed out."))

{tinybird-0.0.1.dev51 → tinybird-0.0.1.dev52}/tinybird.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev51
+Version: 0.0.1.dev52
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird