test: refactor tests for portal service

Author: radugheo

src/uipath/_cli/_auth/_auth_service.py

@@ -20,10 +20,10 @@ def __init__(
         environment: str,
         *,
         force: bool,
-        client_id: Optional[str],
-        client_secret: Optional[str],
-        base_url: Optional[str],
-        scope: Optional[str],
+        client_id: Optional[str] = None,
+        client_secret: Optional[str] = None,
+        base_url: Optional[str] = None,
+        scope: Optional[str] = None,
     ):
         self._force = force
         self._console = ConsoleLogger()

src/uipath/_cli/_auth/_portal_service.py

@@ -26,10 +26,6 @@ class PortalService:
     domain: str
     selected_tenant: Optional[str] = None
 
-    _client: Optional[httpx.Client] = None
-
-    _tenants_and_organizations: Optional[TenantsAndOrganizationInfoResponse] = None
-
     def __init__(
         self,
         domain: str,
@@ -41,6 +37,7 @@ def __init__(
         self.prt_id = prt_id
         self._client = httpx.Client(**get_httpx_client_kwargs())
         self._console = ConsoleLogger()
+        self._tenants_and_organizations = None
 
     def close(self):
         """Explicitly close the HTTP client."""

src/uipath/_cli/_auth/_url_utils.py

@@ -10,10 +10,7 @@
 def _extract_domain(url: str) -> Optional[str]:
     """Return scheme://netloc from a URL, or None if invalid."""
     parsed = urlparse(url)
-    if parsed.scheme and parsed.netloc:
-        return f"{parsed.scheme}://{parsed.netloc}"
-    return None
-
+    return f"{parsed.scheme}://{parsed.netloc}"
 
 def resolve_domain(
     base_url: Optional[str], environment: Optional[str], force: bool = False
@@ -31,14 +28,16 @@ def resolve_domain(
     if not force:
         # If UIPATH_URL is set, prefer its domain
         uipath_url = os.getenv("UIPATH_URL")
-        domain = _extract_domain(uipath_url) if uipath_url else None
-        if domain:
-            return domain
-        elif uipath_url:
-            console.error(
-                f"Malformed UIPATH_URL: '{uipath_url}'. "
-                "Please ensure it includes scheme and netloc (e.g., 'https://cloud.uipath.com')."
-            )
+        if uipath_url and environment == "cloud":
+            parsed = urlparse(uipath_url)
+            if parsed.scheme and parsed.netloc:
+                domain = f"{parsed.scheme}://{parsed.netloc}"
+                return domain
+            else:
+                console.error(
+                    f"Malformed UIPATH_URL: '{uipath_url}'. "
+                    "Please ensure it includes scheme and netloc (e.g., 'https://cloud.uipath.com')."
+                )
 
     # If base_url is a real URL, prefer it
     if base_url and base_url.startswith("http"):
@@ -60,6 +59,7 @@ def build_service_url(domain: str, path: str) -> str:
     Returns:
         The complete service URL
     """
+    print(f"Domain is: {domain}")
     return f"{domain}{path}"
 
 

tests/cli/test_portal_service_refresh_token.py

@@ -27,6 +27,7 @@
 import httpx
 import pytest
 
+from uipath._cli._auth._auth_service import AuthService
 from uipath._cli._auth._portal_service import PortalService
 
 
@@ -58,7 +59,7 @@ class TestPortalServiceRefreshToken:
     """Test class for PortalService refresh token functionality."""
 
     @pytest.mark.parametrize(
-        "domain, expected_token_url",
+        "environment, expected_token_url",
         [
             # Standard UiPath domains
             ("https://cloud.uipath.com", "https://cloud.uipath.com/identity_/connect/token"),
@@ -85,7 +86,7 @@ class TestPortalServiceRefreshToken:
         ],
     )
     def test_post_refresh_token_request_different_domains(
-        self, domain, expected_token_url, mock_auth_config, sample_token_data
+        self, environment, expected_token_url, mock_auth_config, sample_token_data
     ):
         """Test refresh token request with different domain configurations."""
 
@@ -100,8 +101,11 @@ def test_post_refresh_token_request_different_domains(
             mock_response.json.return_value = sample_token_data
             mock_client.post.return_value = mock_response
 
+            # Create AuthService instance
+            auth_service = AuthService(environment=environment, force=False)
+
             # Create PortalService instance
-            portal_service = PortalService(domain)
+            portal_service = PortalService(auth_service._domain)
             portal_service._client = mock_client
 
             # Test refresh token request
@@ -123,7 +127,7 @@ def test_post_refresh_token_request_different_domains(
             assert result == sample_token_data
 
     @pytest.mark.parametrize(
-        "env_var_url, domain, expected_token_url",
+        "env_var_url, environment, expected_token_url",
         [
             # UIPATH_URL should be used when domain is "cloud" (default)
             (
@@ -152,7 +156,7 @@ def test_post_refresh_token_request_different_domains(
     def test_post_refresh_token_request_with_uipath_url_env(
         self,
         env_var_url,
-        domain,
+        environment,
         expected_token_url,
         mock_auth_config,
         sample_token_data,
@@ -175,8 +179,11 @@ def test_post_refresh_token_request_with_uipath_url_env(
                 mock_response.json.return_value = sample_token_data
                 mock_client.post.return_value = mock_response
 
+                # Create AuthService instance
+                auth_service = AuthService(environment=environment, force=False)
+
                 # Create PortalService instance
-                portal_service = PortalService(domain)
+                portal_service = PortalService(auth_service._domain)
                 portal_service._client = mock_client
 
                 # Test refresh token request
@@ -211,15 +218,21 @@ def test_post_refresh_token_request_unauthorized(self, mock_auth_config):
             "uipath._cli._auth._oidc_utils.OidcUtils.get_auth_config",
             return_value=mock_auth_config,
         ):
-            with patch("uipath._cli._auth._portal_service.console") as mock_console:
+            with patch("uipath._cli._auth._portal_service.ConsoleLogger") as mock_logger_cls:
+                mock_console = Mock()
+                mock_logger_cls.return_value = mock_console
+
                 # Create a mock HTTP client
                 mock_client = Mock(spec=httpx.Client)
                 mock_response = Mock()
                 mock_response.status_code = 401
                 mock_client.post.return_value = mock_response
 
+                # Create AuthService instance
+                auth_service = AuthService(environment="cloud", force=False)
+
                 # Create PortalService instance
-                portal_service = PortalService("cloud")
+                portal_service = PortalService(auth_service._domain)
                 portal_service._client = mock_client
 
                 # Test refresh token request - should raise exception due to console.error
@@ -236,15 +249,21 @@ def test_post_refresh_token_request_server_error(self, mock_auth_config):
             "uipath._cli._auth._oidc_utils.OidcUtils.get_auth_config",
             return_value=mock_auth_config,
         ):
-            with patch("uipath._cli._auth._portal_service.console") as mock_console:
+            with patch("uipath._cli._auth._portal_service.ConsoleLogger") as mock_logger_cls:
+                mock_console = Mock()
+                mock_logger_cls.return_value = mock_console
+
                 # Create a mock HTTP client
                 mock_client = Mock(spec=httpx.Client)
                 mock_response = Mock()
                 mock_response.status_code = 500
                 mock_client.post.return_value = mock_response
 
+                # Create AuthService instance
+                auth_service = AuthService(environment="cloud", force=False)
+
                 # Create PortalService instance
-                portal_service = PortalService("cloud")
+                portal_service = PortalService(auth_service._domain)
                 portal_service._client = mock_client
 
                 # Test refresh token request - should raise exception due to console.error
@@ -259,8 +278,11 @@ def test_post_refresh_token_request_server_error(self, mock_auth_config):
     def test_post_refresh_token_request_client_not_initialized(self):
         """Test refresh token request when HTTP client is not initialized."""
 
+        # Create AuthService instance
+        auth_service = AuthService(environment="cloud", force=False)
+
         # Create PortalService instance without initializing client
-        portal_service = PortalService("cloud")
+        portal_service = PortalService(auth_service._domain)
         portal_service._client = None
 
         # Test should raise RuntimeError
@@ -283,8 +305,11 @@ def test_post_refresh_token_request_success_response_format(
             mock_response.json.return_value = sample_token_data
             mock_client.post.return_value = mock_response
 
+            # Create AuthService instance
+            auth_service = AuthService(environment="cloud", force=False)
+
             # Create PortalService instance
-            portal_service = PortalService("cloud")
+            portal_service = PortalService(auth_service._domain)
             portal_service._client = mock_client
 
             # Test refresh token request
@@ -319,7 +344,7 @@ def test_post_refresh_token_request_malformed_domain_handling(
             ),
         ]
 
-        for domain, expected_url in test_cases:
+        for environment, expected_url in test_cases:
             with patch(
                 "uipath._cli._auth._oidc_utils.OidcUtils.get_auth_config",
                 return_value=mock_auth_config,
@@ -331,8 +356,11 @@ def test_post_refresh_token_request_malformed_domain_handling(
                 mock_response.json.return_value = sample_token_data
                 mock_client.post.return_value = mock_response
 
+                # Create AuthService instance
+                auth_service = AuthService(environment=environment, force=False)
+
                 # Create PortalService instance
-                portal_service = PortalService(domain)
+                portal_service = PortalService(auth_service._domain)
                 portal_service._client = mock_client
 
                 # Test refresh token request
@@ -353,7 +381,7 @@ def test_post_refresh_token_request_malformed_domain_handling(
                 mock_client.reset_mock()
 
     @pytest.mark.parametrize(
-        "scenario_name, env_vars, domain, expected_token_url",
+        "scenario_name, env_vars, environment, expected_token_url",
         [
             # These scenarios mirror the test_auth.py test cases but focus on the refresh token endpoint
             (
@@ -398,7 +426,7 @@ def test_post_refresh_token_request_auth_scenarios_integration(
         self,
         scenario_name,
         env_vars,
-        domain,
+        environment,
         expected_token_url,
         mock_auth_config,
         sample_token_data,
@@ -426,9 +454,12 @@ def test_post_refresh_token_request_auth_scenarios_integration(
                 mock_response.json.return_value = sample_token_data
                 mock_client.post.return_value = mock_response
 
+                # Create AuthService instance
+                auth_service = AuthService(environment=environment, force=False)
+
                 # Create PortalService instance with the domain that would be determined
                 # by the auth command logic
-                portal_service = PortalService(domain)
+                portal_service = PortalService(auth_service._domain)
                 portal_service._client = mock_client
 
                 # Test refresh token request