diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c4a52860e..525b6728a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,10 @@ Unreleased ---------- * nothing unreleased +[4.19.11] +--------- +* revert: Reversed the previous reversion of PR #2125, removing blackboard unencrypted columns again. + [4.19.10] --------- * revert: revert "making blackboard unencrypted client credentials nullable" in #2126 diff --git a/enterprise/__init__.py b/enterprise/__init__.py index b725968be..ba03e5d2f 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.19.10" +__version__ = "4.19.11" diff --git a/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py b/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py new file mode 100644 index 000000000..5a9bbc55a --- /dev/null +++ b/integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.23 on 2024-06-04 10:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blackboard', '0022_blackboardlearnerassessmentdatatransmissionaudit_is_transmitted_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='blackboardenterprisecustomerconfiguration', + name='client_id', + ), + migrations.RemoveField( + model_name='blackboardenterprisecustomerconfiguration', + name='client_secret', + ), + ] diff --git a/integrated_channels/blackboard/models.py b/integrated_channels/blackboard/models.py index 982d8d29d..7c906909d 100644 --- a/integrated_channels/blackboard/models.py +++ b/integrated_channels/blackboard/models.py @@ -99,17 +99,6 @@ class BlackboardEnterpriseCustomerConfiguration(EnterpriseCustomerPluginConfigur The Enterprise-specific configuration we need for integrating with Blackboard. """ - client_id = models.CharField( - max_length=255, - blank=True, - default='', - verbose_name="API Client ID or Blackboard Application Key", - help_text=( - "The API Client ID provided to edX by the enterprise customer to be used to make API " - "calls on behalf of the customer. Called Application Key in Blackboard" - ) - ) - decrypted_client_id = EncryptedCharField( max_length=255, blank=True, @@ -143,17 +132,6 @@ def encrypted_client_id(self, value): """ self.decrypted_client_id = value - client_secret = models.CharField( - max_length=255, - blank=True, - default='', - verbose_name="API Client Secret or Application Secret", - help_text=( - "The API Client Secret provided to edX by the enterprise customer to be used to make " - " API calls on behalf of the customer. Called Application Secret in Blackboard" - ) - ) - decrypted_client_secret = EncryptedCharField( max_length=255, blank=True,