[#2940] Add OpenKlant2 configuration model

src/eherkenning/tests/test_mock_views.py

@@ -1,12 +1,13 @@
 from unittest.mock import patch
 from urllib.parse import urlencode
 
-from django.contrib.auth import get_user_model
+from django.contrib.auth import get_user_model, signals
 from django.test import TestCase, modify_settings, override_settings
 from django.urls import reverse
 
 from furl import furl
 
+from open_inwoner.accounts.signals import update_user_from_klant_on_login
 from open_inwoner.kvk.branches import get_kvk_branch_number
 
 RETURN_URL = "/"
@@ -88,6 +89,10 @@ def test_get_returns_valid_response(self):
 @override_settings(**OVERRIDE_SETTINGS)
 @modify_settings(**MODIFY_SETTINGS)
 class PasswordLoginViewTests(eHerkenningMockTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
     def test_get_returns_http400_on_missing_params(self):
         url = reverse("eherkenning-mock:password")
         response = self.client.get(url)

src/open_inwoner/accounts/signals.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.contrib.auth.signals import user_logged_in, user_logged_out
-from django.core.exceptions import ImproperlyConfigured
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.translation import gettext as _
@@ -39,17 +38,15 @@ def update_user_from_klant_on_login(sender, user, request, *args, **kwargs):
     # OpenKlant2
     try:
         service = OpenKlant2Service()
-    except ImproperlyConfigured:
-        logger.error("OpenKlant2 configuration missing")
+    except Exception:
+        logger.error("OpenKlant2 service failed to build")
     else:
         _update_user_from_openklant2(user=user, service=service, request=request)
 
     # eSuite
     try:
         service = eSuiteKlantenService()
-    except ImproperlyConfigured:
-        logger.error("eSuiteKlantenService missing configuration")
-    except RuntimeError:
+    except Exception:
         logger.error("eSuiteKlantenService failed to build")
     else:
         _update_user_from_esuite(user=user, service=service, request=request)

src/open_inwoner/accounts/tests/test_auth.py

@@ -12,15 +12,18 @@
 from django_webtest import WebTest
 from furl import furl
 from pyquery import PyQuery as PQ
+from zgw_consumers.constants import APITypes
 
 from open_inwoner.accounts.choices import NotificationChannelChoice
 from open_inwoner.accounts.signals import update_user_from_klant_on_login
 from open_inwoner.configurations.models import SiteConfiguration
 from open_inwoner.haalcentraal.tests.mixins import HaalCentraalMixin
 from open_inwoner.kvk.branches import get_kvk_branch_number
 from open_inwoner.kvk.tests.factories import CertificateFactory
-from open_inwoner.openklant.tests.data import MockAPIReadPatchData
+from open_inwoner.openklant.tests.data import KLANTEN_ROOT_VCR, MockAPIReadPatchData
+from open_inwoner.openklant.tests.factories import OpenKlant2ConfigFactory
 from open_inwoner.openzaak.models import OpenZaakConfig
+from open_inwoner.openzaak.tests.factories import ServiceFactory
 from open_inwoner.utils.tests.helpers import AssertTimelineLogMixin
 
 from ...cms.collaborate.cms_apps import CollaborateApphook
@@ -55,6 +58,12 @@ class DigiDRegistrationTest(
     def setUpTestData(cls):
         cls.homepage = cms_tools.create_homepage()
 
+        user_logged_in.disconnect(update_user_from_klant_on_login)
+
+        cls.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
     @patch("open_inwoner.accounts.models.OpenIDDigiDConfig.get_solo")
     def test_registration_page_only_digid(self, mock_solo):
         for oidc_enabled in [True, False]:
@@ -519,6 +528,12 @@ class eHerkenningRegistrationTest(AssertRedirectsMixin, WebTest):
     def setUpTestData(cls):
         cms_tools.create_homepage()
 
+        user_logged_in.disconnect(update_user_from_klant_on_login)
+
+        cls.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
     @patch("open_inwoner.accounts.models.OpenIDEHerkenningConfig.get_solo")
     @patch("open_inwoner.configurations.models.SiteConfiguration.get_solo")
     def test_registration_page_eherkenning(self, mock_solo, mock_eherkenning_config):
@@ -1104,6 +1119,13 @@ def setUpTestData(cls):
         cls.msg_dupes = _("This email is already taken.")
         cls.msg_inactive = _("This account has been deactivated")
 
+    def setUp(self):
+        user_logged_in.disconnect(update_user_from_klant_on_login)
+
+        self.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
     def test_digid_user_success(self):
         """Assert that digid users can register with duplicate emails"""
         test_user = DigidUserFactory.create(
@@ -1457,6 +1479,13 @@ def setUpTestData(cls):
         cms_tools.create_homepage()
         cms_tools.create_apphook_page(ProfileApphook)
 
+    def setUp(self):
+        user_logged_in.disconnect(update_user_from_klant_on_login)
+
+        self.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
     def test_page_show_config_text(self):
         config = SiteConfiguration.get_solo()
         config.registration_text = "Hello registration text http://foo.bar/"
@@ -1904,11 +1933,17 @@ def setUpTestData(cls):
         config.enable_notification_channel_choice = True
         config.save()
 
+        cls.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
     def test_update_hook_is_registered_on_login(self, m):
+        user_logged_in.connect(update_user_from_klant_on_login)
         connected_functions = [receiver[1]() for receiver in user_logged_in.receivers]
         self.assertIn(update_user_from_klant_on_login, connected_functions)
 
     def test_update_user_from_klant_hook_only_called_for_digid_and_eherkenning(self, m):
+        user_logged_in.disconnect(update_user_from_klant_on_login)
         self.data = MockAPIReadPatchData().install_mocks(m)
         request = RequestFactory().get("/foo")
         request.user = self.data.user
@@ -1922,15 +1957,22 @@ def test_update_user_from_klant_hook_only_called_for_digid_and_eherkenning(self,
                 with patch(
                     "open_inwoner.openklant.services.eSuiteKlantenService.update_user_from_klant"
                 ) as update_user_from_klant_mock:
-                    update_user_from_klant_on_login(
-                        self.__class__,
-                        request.user,
-                        request,
-                    )
-                    if login_type in [
-                        LoginTypeChoices.digid,
-                        LoginTypeChoices.eherkenning,
-                    ]:
-                        update_user_from_klant_mock.assert_called_once()
-                    else:
-                        update_user_from_klant_mock.assert_not_called()
+                    with patch(
+                        "open_inwoner.openklant.services.OpenKlant2Service.get_or_create_partij_for_user"
+                    ) as openklant2_mock:
+                        openklant2_mock.return_value = None, False
+
+                        update_user_from_klant_on_login(
+                            self.__class__,
+                            request.user,
+                            request,
+                        )
+                        if login_type in [
+                            LoginTypeChoices.digid,
+                            LoginTypeChoices.eherkenning,
+                        ]:
+                            update_user_from_klant_mock.assert_called_once()
+                            openklant2_mock.assert_called_once()
+                        else:
+                            update_user_from_klant_mock.assert_not_called()
+                            openklant2_mock.assert_not_called()

src/open_inwoner/accounts/tests/test_oidc_views.py

@@ -4,7 +4,7 @@
 from urllib.parse import urlencode
 
 from django.conf import settings
-from django.contrib.auth import get_user_model
+from django.contrib.auth import get_user_model, signals
 from django.core.exceptions import ValidationError
 from django.test import TestCase, modify_settings, override_settings
 from django.urls import reverse
@@ -17,6 +17,7 @@
 from mozilla_django_oidc_db.models import OpenIDConnectConfig
 from pyquery import PyQuery as PQ
 
+from open_inwoner.accounts.signals import update_user_from_klant_on_login
 from open_inwoner.accounts.views.auth_oidc import (
     GENERIC_DIGID_ERROR_MSG,
     GENERIC_EHERKENNING_ERROR_MSG,
@@ -85,6 +86,7 @@ class OIDCFlowTests(TestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
         cms_tools.create_homepage()
         cms_tools.create_apphook_page(ProfileApphook)
 
@@ -501,6 +503,7 @@ class DigiDOIDCFlowTests(WebTest):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
         cms_tools.create_homepage()
         cms_tools.create_apphook_page(ProfileApphook)
 
@@ -1058,6 +1061,7 @@ class eHerkenningOIDCFlowTests(WebTest):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
         cms_tools.create_homepage()
         cms_tools.create_apphook_page(ProfileApphook)
 

src/open_inwoner/accounts/tests/test_profile_views.py

@@ -62,6 +62,8 @@
 )
 class ProfileViewTests(WebTest):
     def setUp(self):
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
         self.url = reverse("profile:detail")
         self.return_url = reverse("logout")
         self.user = UserFactory(
@@ -750,6 +752,8 @@ class ProfileDeleteTest(WebTest):
 
     @classmethod
     def setUpTestData(cls):
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
         cls.url = reverse("profile:detail")
 
     def test_delete_regular_user_success(self):
@@ -986,6 +990,10 @@ def test_preselected_values(self):
 @override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
 @patch("open_inwoner.cms.utils.page_display._is_published", return_value=True)
 class EditNotificationsTests(AssertTimelineLogMixin, WebTest):
+    @classmethod
+    def setUpTestData(cls):
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
     def setUp(self):
         self.config = SiteConfiguration.get_solo()
         self.config.notifications_messages_enabled = True
@@ -1103,6 +1111,8 @@ class NotificationsDisplayTests(WebTest):
 
     @classmethod
     def setUpTestData(cls):
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
         cls.url = reverse("profile:notifications")
         cls.user = UserFactory()
 
@@ -1188,6 +1198,8 @@ class NewsletterSubscriptionTests(ClearCachesMixin, WebTest):
     def setUp(self):
         super().setUp()
 
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
         self.profile_app = ProfileConfig.objects.create(
             namespace=ProfileApphook.app_name, newsletters=True
         )
@@ -1426,6 +1438,8 @@ class UserAppointmentsTests(ClearCachesMixin, WebTest):
     def setUp(self):
         super().setUp()
 
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
         self.data = QmaticMockData()
         self.assertTrue(self.data.user.has_verified_email())
 

src/open_inwoner/accounts/views/signals.py

@@ -1,6 +1,5 @@
 import logging
 
-from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
@@ -23,12 +22,10 @@ def get_or_create_klant_for_new_user(
     user = instance
 
     # OpenKlant2
-    # TODO: replace with proper config and refactor branching
-    use_ok2 = getattr(settings, "OPENKLANT2_CONFIG", None)
-    if use_ok2 and (openklant2_config := OpenKlant2Config.from_django_settings()):
+    if openklant2_config := OpenKlant2Config.get_solo():
         try:
             service = OpenKlant2Service(config=openklant2_config)
-        except RuntimeError:
+        except Exception:
             logger.error("OpenKlant2 service failed to build")
             return
 
@@ -53,7 +50,7 @@ def get_or_create_klant_for_new_user(
     # eSuite
     try:
         service = eSuiteKlantenService()
-    except RuntimeError:
+    except Exception:
         logger.error("eSuiteKlantenService failed to build")
         return
 

src/open_inwoner/cms/cases/tests/test_contactform.py

@@ -1,6 +1,7 @@
 from unittest.mock import ANY, patch
 
 from django.conf import settings
+from django.contrib.auth import signals
 from django.core import mail
 from django.test import override_settings
 from django.urls import reverse
@@ -15,14 +16,20 @@
 )
 from zgw_consumers.constants import APITypes
 
+from open_inwoner.accounts.signals import update_user_from_klant_on_login
 from open_inwoner.accounts.tests.factories import (
     DigidUserFactory,
     eHerkenningUserFactory,
 )
 from open_inwoner.openklant.constants import Status
 from open_inwoner.openklant.models import OpenKlantConfig
 from open_inwoner.openklant.services import eSuiteVragenService
-from open_inwoner.openklant.tests.data import CONTACTMOMENTEN_ROOT, KLANTEN_ROOT
+from open_inwoner.openklant.tests.data import (
+    CONTACTMOMENTEN_ROOT,
+    KLANTEN_ROOT,
+    KLANTEN_ROOT_VCR,
+)
+from open_inwoner.openklant.tests.factories import OpenKlant2ConfigFactory
 from open_inwoner.openzaak.models import CatalogusConfig, OpenZaakConfig
 from open_inwoner.openzaak.tests.factories import (
     ServiceFactory,
@@ -62,7 +69,13 @@ class CasesContactFormTestCase(AssertMockMatchersMixin, ClearCachesMixin, WebTes
     def setUp(self):
         super().setUp()
 
-        self.user = DigidUserFactory(bsn="900222086")
+        signals.user_logged_in.disconnect(update_user_from_klant_on_login)
+
+        self.openklant2_config = OpenKlant2ConfigFactory(
+            service=ServiceFactory(api_root=KLANTEN_ROOT_VCR, api_type=APITypes.kc)
+        )
+
+        self.user = DigidUserFactory(bsn="900222086", email="[email protected]")
 
         # services
         self.api_group = ZGWApiGroupConfigFactory(

src/open_inwoner/cms/cases/views/status.py

@@ -7,11 +7,7 @@
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.exceptions import (
-    ImproperlyConfigured,
-    ObjectDoesNotExist,
-    PermissionDenied,
-)
+from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.http import (
     Http404,
     HttpRequest,
@@ -130,14 +126,12 @@ def get_service(self, service_type: KlantenServiceType) -> VragenService | None:
         if service_type == KlantenServiceType.OPENKLANT2:
             try:
                 return OpenKlant2Service()
-            except ImproperlyConfigured:
-                logger.error("OpenKlant2 configuration missing")
+            except Exception:
+                logger.error("Failed to build OpenKlant2 service")
         if service_type == KlantenServiceType.ESUITE:
             try:
                 return eSuiteVragenService()
-            except ImproperlyConfigured:
-                logger.error("eSuiteVragenService configuration missing")
-            except RuntimeError:
+            except Exception:
                 logger.error("Failed to build eSuiteVragenService")
 
     def store_statustype_mapping(self, zaaktype_identificatie):