Merge pull request #2222 from openedx/sameeramin/ENT-8971-b

feat: Remove references to client_id and client_secret from Canvas

CHANGELOG.rst

@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.23.16]
+----------
+* feat: remove references to client_id and client_secret from CanvasEnterpriseCustomerConfiguration
+
 [4.23.15]
 ----------
 * feat: altered decrypted_secret to be encrypted and made credentials nullable

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.23.15"
+__version__ = "4.23.16"

integrated_channels/canvas/admin/__init__.py

@@ -19,8 +19,8 @@ class CanvasEnterpriseCustomerConfigurationAdmin(DjangoObjectActions, admin.Mode
     """
     list_display = (
         "enterprise_customer_name",
-        "client_id",
-        "client_secret",
+        "decrypted_client_id",
+        "decrypted_client_secret",
         "canvas_account_id",
         "canvas_base_url",
     )

integrated_channels/canvas/migrations/0038_alter_canvasenterprisecustomerconfiguration_client_id_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2024-09-02 08:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('canvas', '0037_canvasenterprisecustomerconfiguration_copy_id_and_secret_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='canvasenterprisecustomerconfiguration',
+            name='client_id',
+            field=models.CharField(blank=True, default='', help_text='The API Client ID provided to edX by the enterprise customer to be used to make API calls to Canvas on behalf of the customer.', max_length=255, null=True, verbose_name='API Client ID'),
+        ),
+        migrations.AlterField(
+            model_name='canvasenterprisecustomerconfiguration',
+            name='client_secret',
+            field=models.CharField(blank=True, default='', help_text='The API Client Secret provided to edX by the enterprise customer to be used to make  API calls to Canvas on behalf of the customer.', max_length=255, null=True, verbose_name='API Client Secret'),
+        ),
+    ]

integrated_channels/canvas/models.py

@@ -35,17 +35,6 @@ class CanvasEnterpriseCustomerConfiguration(EnterpriseCustomerPluginConfiguratio
     Based on: https://canvas.instructure.com/doc/api/file.oauth.html#oauth2-flow-3
     """
 
-    client_id = models.CharField(
-        max_length=255,
-        blank=True,
-        default='',
-        verbose_name="API Client ID",
-        help_text=_(
-            "The API Client ID provided to edX by the enterprise customer to be used to make API "
-            "calls to Canvas on behalf of the customer."
-        )
-    )
-
     decrypted_client_id = EncryptedCharField(
         max_length=255,
         blank=True,
@@ -80,17 +69,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",
-        help_text=_(
-            "The API Client Secret provided to edX by the enterprise customer to be used to make "
-            " API calls to Canvas on behalf of the customer."
-        )
-    )
-
     decrypted_client_secret = EncryptedCharField(
         max_length=255,
         blank=True,