From 54b8b14bfe46a65c04e491f04db52adcee345121 Mon Sep 17 00:00:00 2001
From: Cristian Pufu <cristian.pufu@uipath.com>
Date: Sun, 1 Mar 2026 16:01:55 +0200
Subject: [PATCH] fix: add missing auth env variables

---
 pyproject.toml                |  2 +-
 src/uipath/dev/server/auth.py | 16 +++++++++++++++-
 uv.lock                       |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 88f3404..fdb74b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "uipath-dev"
-version = "0.0.66"
+version = "0.0.67"
 description = "UiPath Developer Console"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"
diff --git a/src/uipath/dev/server/auth.py b/src/uipath/dev/server/auth.py
index c76dd54..d50a1eb 100644
--- a/src/uipath/dev/server/auth.py
+++ b/src/uipath/dev/server/auth.py
@@ -992,10 +992,15 @@ def select_tenant(tenant_name: str) -> dict[str, Any]:
 def _finalize_tenant(auth: AuthState, tenant_name: str) -> None:
     """Write .env and os.environ with the resolved credentials."""
     org_name = auth.organization.get("name", "")
+    org_id = auth.organization.get("id", "")
     domain = f"https://{auth.environment}.uipath.com"
     uipath_url = f"{domain}/{org_name}/{tenant_name}"
     access_token = auth.token_data.get("access_token", "")
 
+    # Resolve tenant ID from the tenants list
+    tenant = next((t for t in auth.tenants if t["name"] == tenant_name), None)
+    tenant_id = tenant["id"] if tenant else ""
+
     auth.uipath_url = uipath_url
     auth.status = "authenticated"
 
@@ -1007,12 +1012,19 @@ def _finalize_tenant(auth: AuthState, tenant_name: str) -> None:
     # Update os.environ
     os.environ["UIPATH_ACCESS_TOKEN"] = access_token
     os.environ["UIPATH_URL"] = uipath_url
+    os.environ["UIPATH_TENANT_ID"] = tenant_id
+    os.environ["UIPATH_ORGANIZATION_ID"] = org_id
 
     # Write/update .env file (preserving comments, blank lines, and ordering)
     env_path = Path.cwd() / ".env"
     lines: list[str] = []
     updated_keys: set[str] = set()
-    new_values = {"UIPATH_ACCESS_TOKEN": access_token, "UIPATH_URL": uipath_url}
+    new_values = {
+        "UIPATH_ACCESS_TOKEN": access_token,
+        "UIPATH_URL": uipath_url,
+        "UIPATH_TENANT_ID": tenant_id,
+        "UIPATH_ORGANIZATION_ID": org_id,
+    }
 
     if env_path.exists():
         with open(env_path) as f:
@@ -1043,6 +1055,8 @@ def logout() -> None:
 
     os.environ.pop("UIPATH_ACCESS_TOKEN", None)
     os.environ.pop("UIPATH_URL", None)
+    os.environ.pop("UIPATH_TENANT_ID", None)
+    os.environ.pop("UIPATH_ORGANIZATION_ID", None)
 
     reset_auth_state()
 
diff --git a/uv.lock b/uv.lock
index 319255d..0d16db5 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2266,7 +2266,7 @@ wheels = [
 
 [[package]]
 name = "uipath-dev"
-version = "0.0.66"
+version = "0.0.67"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },