squash

Author: macdiesel

common/djangoapps/third_party_auth/models.py

@@ -357,6 +357,25 @@ def get_register_form_data(cls, pipeline_kwargs):
 
         return registration_form_data
 
+    def get_registration_field_overrides(self):
+        """
+        Get registration field visibility/requirement overrides for this provider.
+
+        This allows providers to configure whether certain fields
+        (like marketing_emails_opt_in or research) should be required,
+        optional, or hidden on the registration form.
+
+        Returns:
+            dict: Mapping of field names to settings ("required", "optional", "hidden")
+                  Returns empty dict if no overrides are configured.
+                  
+        Note:
+            This is a base implementation that returns an empty dict.
+            Subclasses like SAMLProviderConfig may override this to provide
+            actual field override configuration.
+        """
+        return {}
+
     def get_authentication_backend(self):
         """Gets associated Django settings.AUTHENTICATION_BACKEND string."""
         return f'{self.backend_class.__module__}.{self.backend_class.__name__}'

common/djangoapps/third_party_auth/saml.py

@@ -33,7 +33,7 @@ class SAMLAuthBackend(SAMLAuth):  # pylint: disable=abstract-method
     def get_idp(self, idp_name):
         """ Given the name of an IdP, get a SAMLIdentityProvider instance """
         from .models import SAMLProviderConfig
-        return SAMLProviderConfig.current(idp_name).get_config(self)
+        return SAMLProviderConfig.current(idp_name).get_config()
 
     def setting(self, name, default=None):
         """ Get a setting, from SAMLConfiguration """

openedx/core/djangoapps/user_authn/views/registration_form.py

@@ -1204,33 +1204,27 @@ def _apply_provider_field_overrides(self, form_desc, provider_overrides, field_n
 
         override_value = provider_overrides[field_name]
 
-        if override_value == "hidden":
-            # Hide the field completely
-            form_desc.override_field_properties(
-                field_name,
-                field_type="hidden",
-                required=False,
-                label="",
-                instructions="",
-                default=""
-            )
-            return True
-
-        elif override_value == "required":
-            # Make the field required
-            form_desc.override_field_properties(
-                field_name,
-                required=True
-            )
-            return True
-
-        elif override_value == "optional":
-            # Make the field optional (ensure it's not required)
-            form_desc.override_field_properties(
-                field_name,
-                required=False
-            )
-            return True
+        # Find the field in the form_desc and modify it directly
+        for field in form_desc.fields:
+            if field['name'] == field_name:
+                if override_value == "hidden":
+                    # Hide the field completely
+                    field['type'] = 'hidden'
+                    field['required'] = False
+                    field['label'] = ''
+                    field['instructions'] = ''
+                    field['defaultValue'] = ''
+                    return True
+
+                elif override_value == "required":
+                    # Make the field required
+                    field['required'] = True
+                    return True
+
+                elif override_value == "optional":
+                    # Make the field optional (ensure it's not required)
+                    field['required'] = False
+                    return True
 
         return False