Resolving comments

jahnvi480 · jahnvi480 · commit 189bafac43a4 · 2026-05-27T10:38:06.000+05:30
diff --git a/mssql_python/auth.py b/mssql_python/auth.py
@@ -10,7 +10,14 @@
 from typing import Tuple, Dict, Optional
 
 from mssql_python.logging import logger
-from mssql_python.constants import AuthType, ConstantsDDBC
+from mssql_python.constants import (
+    AuthType,
+    ConstantsDDBC,
+    _KEY_AUTHENTICATION,
+    _KEY_UID,
+    _KEY_PWD,
+    _KEY_TRUSTED_CONNECTION,
+)
 
 # Module-level credential instance cache.
 # Reusing credential objects allows the Azure Identity SDK's built-in
@@ -23,7 +30,7 @@
 _credential_cache_lock = threading.Lock()
 
 # Canonical keys to strip when handing an Entra-token connection to ODBC.
-_SENSITIVE_KEYS = frozenset({"UID", "PWD", "Trusted_Connection", "Authentication"})
+_SENSITIVE_KEYS = frozenset({_KEY_UID, _KEY_PWD, _KEY_TRUSTED_CONNECTION, _KEY_AUTHENTICATION})
 
 # Map Authentication connection-string values to internal short names.
 _AUTH_TYPE_MAP: Dict[str, str] = {
@@ -229,5 +236,5 @@ def extract_auth_type(parsed_params: Dict[str, str]) -> Optional[str]:
     no platform checks &mdash; use :func:`process_auth_parameters` when you need
     the Windows-Interactive suppression logic.
     """
-    auth_value = parsed_params.get("Authentication", "").strip().lower()
+    auth_value = parsed_params.get(_KEY_AUTHENTICATION, "").strip().lower()
     return _AUTH_TYPE_MAP.get(auth_value)
diff --git a/mssql_python/connection.py b/mssql_python/connection.py
@@ -49,7 +49,7 @@
 from mssql_python.constants import ConstantsDDBC, GetInfoConstants
 from mssql_python.connection_string_parser import _ConnectionStringParser
 from mssql_python.connection_string_builder import _ConnectionStringBuilder
-from mssql_python.constants import _RESERVED_PARAMETERS
+from mssql_python.constants import _RESERVED_PARAMETERS, _KEY_AUTHENTICATION, _KEY_UID
 
 if TYPE_CHECKING:
     from mssql_python.row import Row
@@ -292,7 +292,7 @@ def __init__(
             raise ValueError("native_uuid must be a boolean value or None")
         self._native_uuid = native_uuid
 
-        self.connection_str, self._parsed_params = self._construct_connection_string(
+        self.connection_str, parsed_params = self._construct_connection_string(
             connection_str, **kwargs
         )
         self._attrs_before = attrs_before or {}
@@ -337,20 +337,20 @@ def __init__(
 
         # Handle Entra ID authentication if specified.
         # The parsed dict is used directly &mdash; no re-parsing of the connection string.
-        if "Authentication" in self._parsed_params:
-            auth_type = process_auth_parameters(self._parsed_params)
+        if _KEY_AUTHENTICATION in parsed_params:
+            auth_type = process_auth_parameters(parsed_params)
 
             if auth_type:
                 # Capture credential kwargs (e.g. user-assigned MSI client_id)
                 # from the parsed dict *before* remove_sensitive_params strips UID.
                 credential_kwargs: Optional[Dict[str, str]] = None
                 if auth_type == "msi":
-                    uid = (self._parsed_params.get("UID") or "").strip()
+                    uid = (parsed_params.get(_KEY_UID) or "").strip()
                     if uid:
                         credential_kwargs = {"client_id": uid}
 
                 # Strip sensitive params and rebuild the connection string.
-                sanitized = remove_sensitive_params(self._parsed_params)
+                sanitized = remove_sensitive_params(parsed_params)
                 self.connection_str = _ConnectionStringBuilder(sanitized).build()
                 token = get_auth_token(auth_type, credential_kwargs)
                 if token:
@@ -360,7 +360,7 @@ def __init__(
             # Store auth type so bulkcopy() can acquire a fresh token later.
             # On Windows Interactive, process_auth_parameters returns None
             # (DDBC handles auth natively), so fall back to extract_auth_type.
-            self._auth_type = auth_type or extract_auth_type(self._parsed_params)
+            self._auth_type = auth_type or extract_auth_type(parsed_params)
 
         self._closed = False
         self._timeout = timeout
diff --git a/mssql_python/constants.py b/mssql_python/constants.py
@@ -519,6 +519,14 @@ def get_attribute_set_timing(attribute):
     "packetsize": "PacketSize",
 }
 
+# Canonical normalized key names produced by _ConnectionStringParser._normalize_params.
+# Consumer code should reference these instead of hard-coding raw strings so that
+# a rename in _ALLOWED_CONNECTION_STRING_PARAMS is caught at import time.
+_KEY_AUTHENTICATION = "Authentication"
+_KEY_UID = "UID"
+_KEY_PWD = "PWD"
+_KEY_TRUSTED_CONNECTION = "Trusted_Connection"
+
 
 def get_info_constants() -> Dict[str, int]:
     """
