Merge branch 'master' into kiram15/ENT-9184

CHANGELOG.rst

@@ -17,6 +17,14 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.25.3]
+----------
+* feat: added encrypted client secret for SAP config
+
+[4.25.2]
+----------
+* feat: added migration file for removing char field decrypted_secret
+
 [4.25.1]
 ----------
 * feat: removed char field decrypted_secret references

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.25.1"
+__version__ = "4.25.3"

enterprise/signals.py

@@ -473,3 +473,5 @@ def update_decrypted_credentials(sender, instance, **kwargs):     # pylint: disa
     """
     if instance.key != instance.decrypted_key:
         instance.decrypted_key = instance.key
+    if instance.secret != instance.decrypted_secret:
+        instance.decrypted_secret = instance.secret

integrated_channels/sap_success_factors/admin/__init__.py

@@ -51,6 +51,7 @@ class SAPSuccessFactorsEnterpriseCustomerConfigurationAdmin(DjangoObjectActions,
         "key",
         "decrypted_key",
         "secret",
+        "decrypted_secret",
         "sapsf_user_id",
         "user_type",
         "has_access_token",

integrated_channels/sap_success_factors/migrations/0020_remove_sapsuccessfactorsenterprisecustomerconfiguration_decrypted_secret.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.23 on 2024-09-04 14:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sap_success_factors', '0019_auto_20240902_1418'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sapsuccessfactorsenterprisecustomerconfiguration',
+            name='decrypted_secret',
+        ),
+    ]

integrated_channels/sap_success_factors/migrations/0021_sapsuccessfactorsenterprisecustomerconfiguration_decrypted_secret.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.23 on 2024-09-04 14:35
+
+from django.db import migrations
+import fernet_fields.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sap_success_factors', '0020_remove_sapsuccessfactorsenterprisecustomerconfiguration_decrypted_secret'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sapsuccessfactorsenterprisecustomerconfiguration',
+            name='decrypted_secret',
+            field=fernet_fields.fields.EncryptedCharField(blank=True, default='', help_text='The encrypted OAuth client secret. It will be encrypted when stored in the database.', max_length=255, null=True, verbose_name='Encrypted Client Secret'),
+        ),
+    ]

integrated_channels/sap_success_factors/models.py

@@ -123,6 +123,18 @@ class SAPSuccessFactorsEnterpriseCustomerConfiguration(EnterpriseCustomerPluginC
         help_text=_("OAuth client secret.")
     )
 
+    decrypted_secret = EncryptedCharField(
+        max_length=255,
+        blank=True,
+        default='',
+        verbose_name="Encrypted Client Secret",
+        help_text=_(
+            "The encrypted OAuth client secret."
+            " It will be encrypted when stored in the database."
+        ),
+        null=True
+    )
+
     user_type = models.CharField(
         max_length=20,
         choices=USER_TYPE_CHOICES,