From 79d6cc225f795bf5d8c32d773757a44a0a9d0298 Mon Sep 17 00:00:00 2001
From: MueezKhan246 <mueez.khan@arbisoft.com>
Date: Mon, 2 Sep 2024 19:22:43 +0500
Subject: [PATCH] revert: revert "altered decrypted_secret to be encrypted and
 made credentials nullable" in #2219

---
 CHANGELOG.rst                                 |  4 +++
 enterprise/__init__.py                        |  2 +-
 .../migrations/0019_auto_20240902_1418.py     | 28 +++++++++++++++++++
 .../sap_success_factors/models.py             |  8 ++----
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 integrated_channels/sap_success_factors/migrations/0019_auto_20240902_1418.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 53a2fd0a4..200146ac2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.23.18]
+----------
+* revert: revert "altered decrypted_secret to be encrypted and made credentials nullable" in #2219
+
 [4.23.17]
 ----------
 * feat: added migrations to remove client_id and client_secret from CanvasEnterpriseCustomerConfiguration
diff --git a/enterprise/__init__.py b/enterprise/__init__.py
index c1eba4e5c..577726043 100644
--- a/enterprise/__init__.py
+++ b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.23.17"
+__version__ = "4.23.18"
diff --git a/integrated_channels/sap_success_factors/migrations/0019_auto_20240902_1418.py b/integrated_channels/sap_success_factors/migrations/0019_auto_20240902_1418.py
new file mode 100644
index 000000000..6f05532c3
--- /dev/null
+++ b/integrated_channels/sap_success_factors/migrations/0019_auto_20240902_1418.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.23 on 2024-09-02 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sap_success_factors', '0018_auto_20240829_0910'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sapsuccessfactorsenterprisecustomerconfiguration',
+            name='decrypted_secret',
+            field=models.CharField(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'),
+        ),
+        migrations.AlterField(
+            model_name='sapsuccessfactorsenterprisecustomerconfiguration',
+            name='key',
+            field=models.CharField(blank=True, default='', help_text='OAuth client identifier.', max_length=255, verbose_name='Client ID'),
+        ),
+        migrations.AlterField(
+            model_name='sapsuccessfactorsenterprisecustomerconfiguration',
+            name='secret',
+            field=models.CharField(blank=True, default='', help_text='OAuth client secret.', max_length=255, verbose_name='Client Secret'),
+        ),
+    ]
diff --git a/integrated_channels/sap_success_factors/models.py b/integrated_channels/sap_success_factors/models.py
index 6ed925744..4cf8e7e73 100644
--- a/integrated_channels/sap_success_factors/models.py
+++ b/integrated_channels/sap_success_factors/models.py
@@ -79,8 +79,7 @@ class SAPSuccessFactorsEnterpriseCustomerConfiguration(EnterpriseCustomerPluginC
         blank=True,
         default='',
         verbose_name="Client ID",
-        help_text=_("OAuth client identifier."),
-        null=True
+        help_text=_("OAuth client identifier.")
     )
 
     decrypted_key = EncryptedCharField(
@@ -121,11 +120,10 @@ class SAPSuccessFactorsEnterpriseCustomerConfiguration(EnterpriseCustomerPluginC
         blank=True,
         default='',
         verbose_name="Client Secret",
-        help_text=_("OAuth client secret."),
-        null=True
+        help_text=_("OAuth client secret.")
     )
 
-    decrypted_secret = EncryptedCharField(
+    decrypted_secret = models.CharField(
         max_length=255,
         blank=True,
         default='',