[#2617] Resolve merge conflict

src/open_inwoner/accounts/migrations/0078_merge_20240919_1736.py

@@ -0,0 +1,13 @@
+# Generated by Django 4.2.16 on 2024-09-19 15:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0077_no_roepnaam"),
+        ("accounts", "0077_openiddigidconfig_openideherkenningconfig"),
+    ]
+
+    operations = []

src/open_inwoner/accounts/models.py

@@ -24,6 +24,7 @@
 from privates.storages import PrivateMediaFileSystemStorage
 from timeline_logger.models import TimelineLog
 
+from open_inwoner.configurations.models import SiteConfiguration
 from open_inwoner.utils.hash import create_sha256_hash
 from open_inwoner.utils.validators import (
     CharFieldValidator,

src/open_inwoner/accounts/tests/test_auth.py

@@ -26,8 +26,9 @@
 from ...cms.tests import cms_tools
 from ...utils.test import ClearCachesMixin
 from ...utils.tests.helpers import AssertRedirectsMixin
-from ..choices import LoginTypeChoices
+from ..choices import LoginTypeChoices, NotificationChannelChoice
 from ..models import OpenIDDigiDConfig, OpenIDEHerkenningConfig, User
+from ..signals import update_user_from_klant_on_login
 from .factories import (
     DigidUserFactory,
     InviteFactory,

src/open_inwoner/accounts/views/registration.py

@@ -14,7 +14,6 @@
 from open_inwoner.accounts.choices import NotificationChannelChoice
 from open_inwoner.accounts.views.mixins import KlantenAPIMixin
 from open_inwoner.configurations.models import SiteConfiguration
-from open_inwoner.utils.hash import generate_email_from_string
 from open_inwoner.utils.views import CommonPageMixin, LogMixin
 
 from ...mail.verification import send_user_email_verification_mail