From 343a7c3ad5bb1519834225133cdfbc10da9c9528 Mon Sep 17 00:00:00 2001
From: MueezKhan246 <93375917+MueezKhan246@users.noreply.github.com>
Date: Fri, 7 Jun 2024 17:59:14 +0500
Subject: [PATCH] Re revert 2118 "Remove blackboard unencrypted columns from
 models" (#2132)

* revert: Reversed the previous reversion of PR #2125, removing blackboard unencrypted columns again.
---
 CHANGELOG.rst                                 |  4 ++++
 enterprise/__init__.py                        |  2 +-
 .../migrations/0023_auto_20240604_1046.py     | 21 ++++++++++++++++++
 integrated_channels/blackboard/models.py      | 22 -------------------
 4 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 integrated_channels/blackboard/migrations/0023_auto_20240604_1046.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c4a52860ed..525b6728a3 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 b725968be3..ba03e5d2f0 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 0000000000..5a9bbc55ab
--- /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 982d8d29d6..7c906909d3 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,