1. Changing auth url from v2beta1 to v2

2. Integration tests for project and tenant wrt MFA config

Author: pragatimodi

firebase_admin/_auth_client.py

@@ -50,7 +50,7 @@ def __init__(self, app, tenant_id=None):
         if emulator_host:
             base_url = 'http://{0}/identitytoolkit.googleapis.com'.format(emulator_host)
             endpoint_urls['v1'] = base_url + '/v1'
-            endpoint_urls['v2beta1'] = base_url + '/v2beta1'
+            endpoint_urls['v2beta1'] = base_url + '/v2'
             credential = _utils.EmulatorAdminCredentials()
             self.emulated = True
         else:
@@ -67,7 +67,7 @@ def __init__(self, app, tenant_id=None):
         self._user_manager = _user_mgt.UserManager(
             http_client, app.project_id, tenant_id, url_override=endpoint_urls.get('v1'))
         self._provider_manager = _auth_providers.ProviderConfigClient(
-            http_client, app.project_id, tenant_id, url_override=endpoint_urls.get('v2beta1'))
+            http_client, app.project_id, tenant_id, url_override=endpoint_urls.get('v2'))
 
     @property
     def tenant_id(self):

firebase_admin/_auth_providers.py

@@ -176,7 +176,7 @@ def items(self):
 class ProviderConfigClient:
     """Client for managing Auth provider configurations."""
 
-    PROVIDER_CONFIG_URL = 'https://identitytoolkit.googleapis.com/v2beta1'
+    PROVIDER_CONFIG_URL = 'https://identitytoolkit.googleapis.com/v2'
 
     def __init__(self, http_client, project_id, tenant_id=None, url_override=None):
         self.http_client = http_client

firebase_admin/tenant_mgt.py

@@ -245,7 +245,7 @@ def multi_factor_config(self):
 class _TenantManagementService:
     """Firebase tenant management service."""
 
-    TENANT_MGT_URL = 'https://identitytoolkit.googleapis.com/v2beta1'
+    TENANT_MGT_URL = 'https://identitytoolkit.googleapis.com/v2'
 
     def __init__(self, app):
         credential = app.credential.get_credential()

integration/test_project_config_mgt.py

@@ -0,0 +1,69 @@
+# Copyright 2023 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Integration tests for firebase_admin.project_config_mgt module."""
+
+import pytest
+
+from firebase_admin import project_config_mgt
+from firebase_admin import multi_factor_config_mgt
+
+
+@pytest.fixture(scope='module')
+def sample_mfa_config():
+    mfa_config = {
+        'providerConfigs': [
+            {
+                'state': 'ENABLED',
+                'totpProviderConfig': {
+                    'adjacentIntervals': 5
+                }
+            }
+        ]
+    }
+    return mfa_config
+
+
+def test_update_project_config():
+    mfa_object = multi_factor_config_mgt.MultiFactorConfig(
+        provider_configs=[
+            multi_factor_config_mgt.ProviderConfig(
+                state=multi_factor_config_mgt.ProviderConfig.State.ENABLED,
+                totp_provider_config=multi_factor_config_mgt.TOTPProviderConfig(
+                    adjacent_intervals=5
+                )
+            )
+        ]
+    )
+    project_config = project_config_mgt.update_project_config(multi_factor_config=mfa_object)
+    _assert_multi_factor_config(project_config.multi_factor_config)
+
+
+def test_get_project():
+    project_config = project_config_mgt.get_project_config()
+    assert isinstance(project_config, project_config_mgt.ProjectConfig)
+    _assert_multi_factor_config(project_config.multi_factor_config)
+
+def _assert_multi_factor_config(multi_factor_config):
+    assert isinstance(multi_factor_config, multi_factor_config_mgt.MultiFactorServerConfig)
+    assert len(multi_factor_config.provider_configs) == 1
+    assert isinstance(multi_factor_config.provider_configs, list)
+    for provider_config in multi_factor_config.provider_configs:
+        assert isinstance(provider_config, multi_factor_config_mgt.MultiFactorServerConfig
+                          .ProviderConfigServerConfig)
+        assert provider_config.state == 'ENABLED'
+        assert isinstance(provider_config.totp_provider_config,
+                          multi_factor_config_mgt.MultiFactorServerConfig.ProviderConfigServerConfig
+                          .TOTPProviderServerConfig)
+        assert provider_config.totp_provider_config.adjacent_intervals == 5

integration/test_tenant_mgt.py

@@ -25,6 +25,7 @@
 
 from firebase_admin import auth
 from firebase_admin import tenant_mgt
+from firebase_admin import multi_factor_config_mgt
 from integration import test_auth
 
 
@@ -35,13 +36,34 @@
 
 @pytest.fixture(scope='module')
 def sample_tenant():
+    mfa_object = multi_factor_config_mgt.MultiFactorConfig(
+        provider_configs=[multi_factor_config_mgt.ProviderConfig(
+            state=multi_factor_config_mgt.ProviderConfig.State.ENABLED,
+            totp_provider_config=multi_factor_config_mgt.TOTPProviderConfig(
+                adjacent_intervals=5
+            )
+        )]
+    )
     tenant = tenant_mgt.create_tenant(
         display_name='admin-python-tenant',
         allow_password_sign_up=True,
-        enable_email_link_sign_in=True)
+        enable_email_link_sign_in=True,
+        multi_factor_config=mfa_object)
     yield tenant
     tenant_mgt.delete_tenant(tenant.tenant_id)
 
+def _assert_multi_factor_config(mfa_config):
+    assert isinstance(mfa_config, multi_factor_config_mgt.MultiFactorServerConfig)
+    assert len(mfa_config.provider_configs) == 1
+    assert isinstance(mfa_config.provider_configs, list)
+    for provider_config in mfa_config.provider_configs:
+        assert isinstance(provider_config, multi_factor_config_mgt.MultiFactorServerConfig.\
+                          ProviderConfigServerConfig)
+        assert provider_config.state == 'ENABLED'
+        assert isinstance(provider_config.totp_provider_config,
+                          multi_factor_config_mgt.MultiFactorServerConfig.ProviderConfigServerConfig
+                          .TOTPProviderServerConfig)
+        assert provider_config.totp_provider_config.adjacent_intervals == 5
 
 @pytest.fixture(scope='module')
 def tenant_user(sample_tenant):
@@ -59,6 +81,7 @@ def test_get_tenant(sample_tenant):
     assert tenant.display_name == 'admin-python-tenant'
     assert tenant.allow_password_sign_up is True
     assert tenant.enable_email_link_sign_in is True
+    _assert_multi_factor_config(tenant.multi_factor_config)
 
 
 def test_list_tenants(sample_tenant):
@@ -76,8 +99,17 @@ def test_list_tenants(sample_tenant):
 
 
 def test_update_tenant():
+    mfa_object = multi_factor_config_mgt.MultiFactorConfig(
+        provider_configs=[multi_factor_config_mgt.ProviderConfig(
+            state=multi_factor_config_mgt.ProviderConfig.State.ENABLED,
+            totp_provider_config=multi_factor_config_mgt.TOTPProviderConfig(
+                adjacent_intervals=5
+            )
+        )]
+    )
     tenant = tenant_mgt.create_tenant(
-        display_name='py-update-test', allow_password_sign_up=True, enable_email_link_sign_in=True)
+        display_name='py-update-test', allow_password_sign_up=True, enable_email_link_sign_in=True,
+        multi_factor_config=mfa_object)
     try:
         tenant = tenant_mgt.update_tenant(
             tenant.tenant_id, display_name='updated-py-tenant', allow_password_sign_up=False,
@@ -87,6 +119,7 @@ def test_update_tenant():
         assert tenant.display_name == 'updated-py-tenant'
         assert tenant.allow_password_sign_up is False
         assert tenant.enable_email_link_sign_in is False
+        _assert_multi_factor_config(tenant.multi_factor_config)
     finally:
         tenant_mgt.delete_tenant(tenant.tenant_id)