✨[#114] IDC anymore, I will squash

maykinmedia · Oct 22, 2024 · 54ad63f · 54ad63f
1 parent 2dccbf8
commit 54ad63f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/docs/setup_configuration.rst b/docs/setup_configuration.rst
@@ -22,7 +22,7 @@ put the ``AdminOIDCConfigurationStep`` in your django-setup-configuration steps:
 
     SETUP_CONFIGURATION_STEPS = [
         ...
-        "mozilla_django_oidc_db.setupconfig.bootstrap.AdminOIDCConfigurationStep",
+        "mozilla_django_oidc_db.setup_config.AdminOIDCConfigurationStep",
         ...
     ]
 

diff --git a/...a_django_oidc_db/setupconfig/bootstrap.py → mozilla_django_oidc_db/setup_config.py b/...a_django_oidc_db/setupconfig/bootstrap.py → mozilla_django_oidc_db/setup_config.py
@@ -8,9 +8,9 @@
 from django_setup_configuration.configuration import BaseConfigurationStep
 from django_setup_configuration.exceptions import ConfigurationRunFailed, SelfTestFailed
 
-from ..forms import OIDCSetupConfigForm
-from ..models import OpenIDConnectConfig
-from ..views import OIDCAuthenticationRequestView
+from .forms import OIDCSetupConfigForm
+from .models import OpenIDConnectConfig
+from .views import OIDCAuthenticationRequestView
 
 
 class AdminOIDCConfigurationStep(BaseConfigurationStep):
@@ -22,7 +22,7 @@ class AdminOIDCConfigurationStep(BaseConfigurationStep):
 
     config_settings = ConfigSettings(
         enable_setting="OIDC_DB_CONFIG_ENABLE",
-        display_name="Admin OIDC Configuration",
+        display_name=_("Admin OIDC Configuration"),
         namespace="OIDC_DB",
         models=[OpenIDConnectConfig],
         update_fields=True,
@@ -38,17 +38,15 @@ def configure(self):
         all_settings = {
             "sync_groups": config.sync_groups,
             "oidc_use_nonce": config.oidc_use_nonce,
+            "enabled": True,
             **settings.OIDC_DB_SETUP_CONFIG_ADMIN_AUTH,
         }
 
-        if "default_groups" in all_settings:
-            groups = all_settings["default_groups"]
+        if groups := all_settings.get("default_groups"):
             for group_name in groups:
                 Group.objects.get_or_create(name=group_name)
             all_settings["default_groups"] = Group.objects.filter(name__in=groups)
 
-        all_settings["enabled"] = True
-
         form = OIDCSetupConfigForm(
             instance=config,
             data=all_settings,
@@ -63,9 +61,9 @@ def configure(self):
     def test_configuration(self):
 
         request_factory = RequestFactory()
-        request = request_factory.get("/")
+        request = request_factory.get("/irrelevant")
 
-        middleware = SessionMiddleware(lambda x: None)
+        middleware = SessionMiddleware(lambda x: None)  # type: ignore
         middleware.process_request(request)
         request.session.save()
 
@@ -76,5 +74,5 @@ def test_configuration(self):
 
         config = OpenIDConnectConfig.get_solo()
 
-        if config.oidc_op_authorization_endpoint not in response.url:
+        if not response.url.startswith(config.oidc_op_authorization_endpoint):
             raise SelfTestFailed
diff --git a/mozilla_django_oidc_db/setupconfig/__init__.py b/mozilla_django_oidc_db/setupconfig/__init__.py
diff --git a/testapp/settings.py b/testapp/settings.py
@@ -89,7 +89,7 @@
 
     OIDC_DB_CONFIG_ENABLE = True
     SETUP_CONFIGURATION_STEPS = [
-        "mozilla_django_oidc_db.setupconfig.bootstrap.AdminOIDCConfigurationStep",
+        "mozilla_django_oidc_db.setup_config.AdminOIDCConfigurationStep",
     ]
 except ImportError:
     pass
diff --git a/tests/setupconfig/test_auth.py b/tests/setupconfig/test_auth.py
@@ -10,7 +10,7 @@
     OpenIDConnectConfig,
     UserInformationClaimsSources,
 )
-from mozilla_django_oidc_db.setupconfig.bootstrap import AdminOIDCConfigurationStep
+from mozilla_django_oidc_db.setup_config import AdminOIDCConfigurationStep
 
 from ..conftest import KEYCLOAK_BASE_URL