fix(auth): simplify tenant and provider ID validation checks

Author: macastelaz

firebase_admin/_auth_providers.py

@@ -387,9 +387,7 @@ def _validate_oidc_provider_id(provider_id):
     if not isinstance(provider_id, str):
         raise ValueError(
             f'Invalid OIDC provider ID: {provider_id}. Provider ID must be a non-empty string.')
-    if (not provider_id.startswith('oidc.') or
-            provider_id == 'oidc.' or
-            not _auth_utils.is_safe_url_segment(provider_id)):
+    if not provider_id.startswith('oidc.') or not _auth_utils.is_safe_url_segment(provider_id):
         raise ValueError(f'Invalid OIDC provider ID: {provider_id}.')
     return provider_id
 
@@ -398,9 +396,7 @@ def _validate_saml_provider_id(provider_id):
     if not isinstance(provider_id, str):
         raise ValueError(
             f'Invalid SAML provider ID: {provider_id}. Provider ID must be a non-empty string.')
-    if (not provider_id.startswith('saml.') or
-            provider_id == 'saml.' or
-            not _auth_utils.is_safe_url_segment(provider_id)):
+    if not provider_id.startswith('saml.') or not _auth_utils.is_safe_url_segment(provider_id):
         raise ValueError(f'Invalid SAML provider ID: {provider_id}.')
     return provider_id
 

firebase_admin/tenant_mgt.py

@@ -288,11 +288,7 @@ def update_tenant(
             self, tenant_id, display_name=None, allow_password_sign_up=None,
             enable_email_link_sign_in=None):
         """Updates the specified tenant with the given parameters."""
-        if not isinstance(tenant_id, str) or not tenant_id:
-            raise ValueError('Tenant ID must be a non-empty string.')
-        if not _auth_utils.is_safe_url_segment(tenant_id):
-            raise ValueError(
-                'Tenant ID must be a non-empty string with valid URL path segment characters.')
+        _auth_utils.validate_tenant_id(tenant_id)
 
         payload = {}
         if display_name is not None:

tests/test_tenant_mgt.py

@@ -308,7 +308,7 @@ class TestUpdateTenant:
     def test_invalid_tenant_id(self, tenant_id, tenant_mgt_app):
         with pytest.raises(ValueError) as excinfo:
             tenant_mgt.update_tenant(tenant_id, display_name='My Tenant', app=tenant_mgt_app)
-        assert str(excinfo.value).startswith('Tenant ID must be a non-empty string')
+        assert str(excinfo.value).startswith('Invalid tenant ID')
 
     @pytest.mark.parametrize('display_name', [True, False, 1, 0, [], tuple(), {}])
     def test_invalid_display_name_type(self, display_name, tenant_mgt_app):