👌 [#200] Process PR feedback

docker/setup_configuration/data.yaml

@@ -34,15 +34,3 @@ vng_api_common_credentials:
   # Credentials for Open Notificaties, required for autorisaties subscription
   - identifier: open-notificaties
     secret: oPMsHCEuoP9Qh8vP06D7
-
-# notifications_config_enable: True
-# notifications_config:
-#   notifications_api_service_identifier: notificaties-api
-#   notification_delivery_max_retries: 5
-#   notification_delivery_retry_backoff: 3
-#   notification_delivery_retry_backoff_max: 30
-
-# site_config_enable: True
-# site_config:
-#   domain: localhost:8001
-#   organization: Demodam

docs/installation/configuration/env_config.rst

@@ -110,7 +110,6 @@ Optional
 * ``LOG_OUTGOING_REQUESTS_MAX_AGE``: The amount of time after which request logs should be deleted from the database. Defaults to: ``7``.
 * ``SENTRY_DSN``: URL of the sentry project to send error reports to. Default empty, i.e. -> no monitoring set up. Highly recommended to configure this.
 * ``EXTRA_VERIFY_CERTS``: a comma-separated list of paths to certificates to trust, If you're using self-signed certificates for the services that Open Notificaties communicates with, specify the path to those (root) certificates here, rather than disabling SSL certificate verification. Example: ``EXTRA_VERIFY_CERTS=/etc/ssl/root1.crt,/etc/ssl/root2.crt``. Defaults to: ``(empty string)``.
-* ``OPENNOTIFICATIES_DOMAIN``: The domain for this Open Notificaties instance (``[host]:[port]`` or ``[host]``). Defaults to: ``(empty string)``.
 
 
 

src/nrc/conf/includes/base.py

@@ -135,10 +135,6 @@
     "zgw_consumers.contrib.setup_configuration.steps.ServiceConfigurationStep",
     "vng_api_common.contrib.setup_configuration.steps.JWTSecretsConfigurationStep",
     "nrc.setup_configuration.authorization.AuthorizationStep",
-    # TODO these need to be implemented later
-    # "notifications_api_common.contrib.setup_configuration.steps.NotificationConfigurationStep",
-    # TODO this should be moved to `django-setup-configuration`
-    # "nrc.config.site.SiteConfigurationStep",
 ]
 
 #
@@ -156,13 +152,3 @@
         "``EXTRA_VERIFY_CERTS=/etc/ssl/root1.crt,/etc/ssl/root2.crt``."
     ),
 )
-
-#
-# Open Notificaties settings
-#
-
-OPENNOTIFICATIES_DOMAIN = config(
-    "OPENNOTIFICATIES_DOMAIN",
-    "",
-    help_text="The domain for this Open Notificaties instance (``[host]:[port]`` or ``[host]``)",
-)

src/nrc/setup_configuration/models.py

@@ -1,20 +1,9 @@
-from django.contrib.sites.models import Site
-
 from django_setup_configuration.fields import DjangoModelRef
 from django_setup_configuration.models import ConfigurationModel
-from pydantic import Field
 from vng_api_common.authorizations.models import AuthorizationsConfig
 
 
 class AuthorizationsConfigModel(ConfigurationModel):
     authorizations_api_service_identifier: str = DjangoModelRef(
         AuthorizationsConfig, "authorizations_api_service"
     )
-
-
-class SiteConfigModel(ConfigurationModel):
-    organization: str = Field()
-    """The name of the organization that owns this Open Notificaties instance"""
-
-    class Meta:
-        django_model_refs = {Site: ("domain",)}

src/nrc/tests/setup_configuration/test_authorization_configuration.py

@@ -6,7 +6,9 @@
 
 from nrc.setup_configuration.authorization import AuthorizationStep
 
-CONFIG_FILE_PATH = "src/nrc/tests/config/files/setup_config_auth_config.yaml"
+CONFIG_FILE_PATH = (
+    "src/nrc/tests/setup_configuration/files/setup_config_auth_config.yaml"
+)
 
 
 class AuthorizationConfigurationTests(TestCase):

src/nrc/utils/__init__.py

@@ -1,29 +0,0 @@
-from django.conf import settings
-from django.http import HttpRequest
-
-from furl import furl
-
-
-def get_domain() -> str:
-    """
-    Obtain the domain/netloc of Open Notificaties according to settings or configuration.
-    """
-    from django.contrib.sites.models import Site
-
-    if settings.OPENNOTIFICATIES_DOMAIN:
-        return settings.OPENNOTIFICATIES_DOMAIN
-
-    return Site.objects.get_current().domain
-
-
-def build_absolute_url(path: str, request: HttpRequest | None = None) -> str:
-    if request is not None:
-        return request.build_absolute_uri(path)
-
-    domain = get_domain()
-    _furl = furl(
-        scheme="https" if settings.IS_HTTPS else "http",
-        netloc=domain,
-        path=path,
-    )
-    return _furl.url