🐛 [#129] Move all endpoints to endpoints_config in setup config model

maykinmedia · Dec 10, 2024 · 1134cd3 · 1134cd3
1 parent 19ba313
commit 1134cd3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/mozilla_django_oidc_db/setup_configuration/models.py b/mozilla_django_oidc_db/setup_configuration/models.py
@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Literal, Union
 
 from django_setup_configuration.fields import DjangoModelRef
 from django_setup_configuration.models import ConfigurationModel
@@ -18,6 +18,12 @@ class OIDCFullEndpointConfig(ConfigurationModel):
     oidc_op_user_endpoint: AnyUrl = DjangoModelRef(
         OpenIDConnectConfig, "oidc_op_user_endpoint"
     )
+    oidc_op_logout_endpoint: AnyUrl | Literal[""] = DjangoModelRef(
+        OpenIDConnectConfig, "oidc_op_logout_endpoint"
+    )
+    oidc_op_jwks_endpoint: AnyUrl | Literal[""] = DjangoModelRef(
+        OpenIDConnectConfig, "oidc_op_jwks_endpoint"
+    )
 
 
 class OIDCDiscoveryEndpoint(ConfigurationModel):
@@ -80,8 +86,6 @@ class Meta:
                 "oidc_token_use_basic_auth",
                 "oidc_rp_sign_algo",
                 "oidc_rp_idp_sign_key",
-                "oidc_op_logout_endpoint",
-                "oidc_op_jwks_endpoint",
                 "oidc_use_nonce",
                 "oidc_nonce_size",
                 "oidc_state_size",

diff --git a/mozilla_django_oidc_db/setup_configuration/steps.py b/mozilla_django_oidc_db/setup_configuration/steps.py
@@ -34,10 +34,8 @@ def execute(self, model: AdminOIDCConfigurationModel) -> None:
             "oidc_rp_client_secret": config_model.oidc_rp_client_secret,
             "oidc_rp_sign_algo": config_model.oidc_rp_sign_algo,
             "oidc_rp_scopes_list": config_model.oidc_rp_scopes_list,
-            "oidc_op_jwks_endpoint": config_model.oidc_op_jwks_endpoint,
             "oidc_token_use_basic_auth": config_model.oidc_token_use_basic_auth,
             "oidc_rp_idp_sign_key": config_model.oidc_rp_idp_sign_key,
-            "oidc_op_logout_endpoint": config_model.oidc_op_logout_endpoint,
             "oidc_use_nonce": config_model.oidc_use_nonce,
             "oidc_nonce_size": config_model.oidc_nonce_size,
             "oidc_state_size": config_model.oidc_state_size,
@@ -66,6 +64,8 @@ def execute(self, model: AdminOIDCConfigurationModel) -> None:
                 oidc_op_authorization_endpoint=config_model.endpoint_config.oidc_op_authorization_endpoint,
                 oidc_op_token_endpoint=config_model.endpoint_config.oidc_op_token_endpoint,
                 oidc_op_user_endpoint=config_model.endpoint_config.oidc_op_user_endpoint,
+                oidc_op_logout_endpoint=config_model.endpoint_config.oidc_op_logout_endpoint,
+                oidc_op_jwks_endpoint=config_model.endpoint_config.oidc_op_jwks_endpoint,
             )
 
         form = OpenIDConnectConfigForm(