Replaced unencrypted columns of user data credentials in moodle config

CHANGELOG.rst

@@ -16,6 +16,12 @@ Change Log
 Unreleased
 ----------
 
+[4.10.2]
+--------
+
+feat: removed unencrypted user credentials data columns
+
+
 [4.10.1]
 --------
 

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.10.1"
+__version__ = "4.10.2"

integrated_channels/moodle/client.py

@@ -10,7 +10,6 @@
 import requests
 
 from django.apps import apps
-from django.conf import settings
 
 from integrated_channels.exceptions import ClientError
 from integrated_channels.integrated_channel.client import IntegratedChannelApiClient
@@ -135,12 +134,7 @@ def __init__(self, enterprise_configuration):
         """
         super().__init__(enterprise_configuration)
         self.config = apps.get_app_config('moodle')
-        token = (
-            enterprise_configuration.decrypted_token
-            if getattr(settings, 'FEATURES', {}).get('USE_ENCRYPTED_USER_DATA', False)
-            else enterprise_configuration.token
-        )
-        self.token = token or self._get_access_token()
+        self.token = enterprise_configuration.decrypted_token or self._get_access_token()
         self.api_url = urljoin(self.enterprise_configuration.moodle_base_url, self.MOODLE_API_PATH)
 
     def _post(self, additional_params):
@@ -180,12 +174,6 @@ def _get_access_token(self):
             'service': self.enterprise_configuration.service_short_name
         }
 
-        decrypted_username = self.enterprise_configuration.decrypted_username
-        username = self.enterprise_configuration.username
-        decrypted_password = self.enterprise_configuration.decrypted_password
-        password = self.enterprise_configuration.password
-        use_encrypted_user_data = getattr(settings, 'FEATURES', {}).get('USE_ENCRYPTED_USER_DATA', False)
-
         response = requests.post(
             urljoin(
                 self.enterprise_configuration.moodle_base_url,
@@ -196,8 +184,8 @@ def _get_access_token(self):
                 'Content-Type': 'application/x-www-form-urlencoded',
             },
             data={
-                "username": decrypted_username if use_encrypted_user_data else username,
-                "password": decrypted_password if use_encrypted_user_data else password,
+                "username": self.enterprise_configuration.decrypted_username,
+                "password": self.enterprise_configuration.decrypted_password,
             },
         )
 

integrated_channels/moodle/migrations/0032_auto_20240117_1202.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.23 on 2024-01-17 12:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('moodle', '0031_moodlelearnerdatatransmissionaudit_transmission_status'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='historicalmoodleenterprisecustomerconfiguration',
+            name='password',
+        ),
+        migrations.RemoveField(
+            model_name='historicalmoodleenterprisecustomerconfiguration',
+            name='token',
+        ),
+        migrations.RemoveField(
+            model_name='historicalmoodleenterprisecustomerconfiguration',
+            name='username',
+        ),
+        migrations.RemoveField(
+            model_name='moodleenterprisecustomerconfiguration',
+            name='password',
+        ),
+        migrations.RemoveField(
+            model_name='moodleenterprisecustomerconfiguration',
+            name='token',
+        ),
+        migrations.RemoveField(
+            model_name='moodleenterprisecustomerconfiguration',
+            name='username',
+        ),
+    ]

integrated_channels/moodle/models.py

@@ -57,15 +57,6 @@ class MoodleEnterpriseCustomerConfiguration(EnterpriseCustomerPluginConfiguratio
         )
     )
 
-    username = models.CharField(
-        max_length=255,
-        verbose_name="Webservice Username",
-        blank=True,
-        help_text=_(
-            "The API user's username used to obtain new tokens."
-        )
-    )
-
     decrypted_username = EncryptedCharField(
         max_length=255,
         verbose_name="Encrypted Webservice Username",
@@ -100,15 +91,6 @@ def encrypted_username(self, value):
         """
         self.decrypted_username = value
 
-    password = models.CharField(
-        max_length=255,
-        blank=True,
-        verbose_name="Webservice Password",
-        help_text=_(
-            "The API user's password used to obtain new tokens."
-        )
-    )
-
     decrypted_password = EncryptedCharField(
         max_length=255,
         verbose_name="Encrypted Webservice Password",
@@ -143,15 +125,6 @@ def encrypted_password(self, value):
         """
         self.decrypted_password = value
 
-    token = models.CharField(
-        max_length=255,
-        blank=True,
-        verbose_name="Webservice User Token",
-        help_text=_(
-            "The user's token for the Moodle webservice."
-        )
-    )
-
     decrypted_token = EncryptedCharField(
         max_length=255,
         verbose_name="Encrypted Webservice Token",

tests/test_integrated_channels/test_api/test_moodle/test_views.py

@@ -142,9 +142,6 @@ def test_is_valid_field(self, mock_current_request):
         self.moodle_config.decrypted_token = ''
         self.moodle_config.decrypted_username = ''
         self.moodle_config.decrypted_password = ''
-        self.moodle_config.token = ''
-        self.moodle_config.username = ''
-        self.moodle_config.password = ''
         self.moodle_config.moodle_base_url = ''
         self.moodle_config.service_short_name = ''
         self.moodle_config.save()
@@ -158,9 +155,6 @@ def test_is_valid_field(self, mock_current_request):
         self.moodle_config.decrypted_username = 'lmao'
         self.moodle_config.decrypted_password = 'foobar'
         self.moodle_config.decrypted_token = 'baa'
-        self.moodle_config.username = 'lmao'
-        self.moodle_config.password = 'foobar'
-        self.moodle_config.token = 'baa'
         self.moodle_config.moodle_base_url = 'http://lovely.com'
         self.moodle_config.service_short_name = 'short'
         self.moodle_config.display_name = '1234!@#$'

tests/test_integrated_channels/test_moodle/test_client.py

@@ -82,18 +82,12 @@ def setUp(self):
             decrypted_username=self.user,
             decrypted_password=self.password,
             decrypted_token=self.token,
-            username=self.user,
-            password=self.password,
-            token=self.token,
         )
         self.enterprise_custom_config = factories.MoodleEnterpriseCustomerConfigurationFactory(
             moodle_base_url=self.custom_moodle_base_url,
             decrypted_username=self.user,
             decrypted_password=self.password,
             decrypted_token=self.token,
-            username=self.user,
-            password=self.password,
-            token=self.token,
             grade_scale=10,
             grade_assignment_name='edX Grade Test'
         )

tests/test_integrated_channels/test_moodle/test_exporters/test_learner_data.py

@@ -30,9 +30,9 @@ def setUp(self):
             moodle_base_url='foobar',
             service_short_name='shortname',
             category_id=1,
-            username='username',
-            password='password',
-            token='token',
+            decrypted_username='username',
+            decrypted_password='password',
+            decrypted_token='token',
         )
 
     @mock.patch('enterprise.api_client.discovery.CourseCatalogApiServiceClient')

tests/test_integrated_channels/test_moodle/test_transmitters/test_content_metadata.py

@@ -36,9 +36,6 @@ def setUp(self):
             decrypted_username=self.user,
             decrypted_password=self.password,
             decrypted_token=self.api_token,
-            username=self.user,
-            password=self.password,
-            token=self.api_token,
         )
 
     def test_prepare_items_for_transmission(self):

tests/test_integrated_channels/test_moodle/test_transmitters/test_learner_data.py

@@ -39,9 +39,6 @@ def setUp(self):
             decrypted_username='username',
             decrypted_password='password',
             decrypted_token='token',
-            username='username',
-            password='password',
-            token='token',
         )
         self.payload = MoodleLearnerDataTransmissionAudit(
             moodle_user_email=self.enterprise_customer.contact_email,