From f0c0ba3653f7135e826f11e3d33bfe1a9e5ebc12 Mon Sep 17 00:00:00 2001
From: jiangweidong <weidong.jiang@fit2cloud.com>
Date: Thu, 8 Jun 2023 10:06:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3lina=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAjson=E6=A0=BC=E5=BC=8F=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96DictSerializer=E6=94=B9=E4=B8=BAJSONSerialzer?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/serializers/auth/cas.py    | 2 +-
 apps/settings/serializers/auth/ldap.py   | 2 +-
 apps/settings/serializers/auth/oauth2.py | 2 +-
 apps/settings/serializers/auth/oidc.py   | 2 +-
 apps/settings/serializers/auth/saml2.py  | 2 +-
 apps/settings/serializers/auth/sms.py    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/settings/serializers/auth/cas.py b/apps/settings/serializers/auth/cas.py
index 4cfa07d1b..4fc964529 100644
--- a/apps/settings/serializers/auth/cas.py
+++ b/apps/settings/serializers/auth/cas.py
@@ -25,5 +25,5 @@ class CASSettingSerializer(serializers.Serializer):
     CAS_APPLY_ATTRIBUTES_TO_USER = serializers.BooleanField(
         required=False, label=_('Enable attributes map')
     )
-    CAS_RENAME_ATTRIBUTES = serializers.DictField(required=False, label=_('Rename attr'))
+    CAS_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr'))
     CAS_CREATE_USER = serializers.BooleanField(required=False, label=_('Create user if not'))
diff --git a/apps/settings/serializers/auth/ldap.py b/apps/settings/serializers/auth/ldap.py
index 016301558..cc1976884 100644
--- a/apps/settings/serializers/auth/ldap.py
+++ b/apps/settings/serializers/auth/ldap.py
@@ -54,7 +54,7 @@ class LDAPSettingSerializer(serializers.Serializer):
         max_length=1024, required=True, label=_('User search filter'),
         help_text=_('Choice may be (cn|uid|sAMAccountName)=%(user)s)')
     )
-    AUTH_LDAP_USER_ATTR_MAP = serializers.DictField(
+    AUTH_LDAP_USER_ATTR_MAP = serializers.JSONField(
         required=True, label=_('User attr map'),
         help_text=_('User attr map present how to map LDAP user attr to '
                     'jumpserver, username,name,email is jumpserver attr')
diff --git a/apps/settings/serializers/auth/oauth2.py b/apps/settings/serializers/auth/oauth2.py
index 6aaacaa5b..d7f1f4407 100644
--- a/apps/settings/serializers/auth/oauth2.py
+++ b/apps/settings/serializers/auth/oauth2.py
@@ -52,7 +52,7 @@ class OAuth2SettingSerializer(serializers.Serializer):
         required=False, allow_blank=True, max_length=1024, label=_('Provider end session endpoint')
     )
     AUTH_OAUTH2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely'))
-    AUTH_OAUTH2_USER_ATTR_MAP = serializers.DictField(
+    AUTH_OAUTH2_USER_ATTR_MAP = serializers.JSONField(
         required=True, label=_('User attr map')
     )
     AUTH_OAUTH2_ALWAYS_UPDATE_USER = serializers.BooleanField(
diff --git a/apps/settings/serializers/auth/oidc.py b/apps/settings/serializers/auth/oidc.py
index 2c1aa8411..2daf02ff5 100644
--- a/apps/settings/serializers/auth/oidc.py
+++ b/apps/settings/serializers/auth/oidc.py
@@ -33,7 +33,7 @@ class CommonSettingSerializer(serializers.Serializer):
     AUTH_OPENID_IGNORE_SSL_VERIFICATION = serializers.BooleanField(
         required=False, label=_('Ignore ssl verification')
     )
-    AUTH_OPENID_USER_ATTR_MAP = serializers.DictField(
+    AUTH_OPENID_USER_ATTR_MAP = serializers.JSONField(
         required=True, label=_('User attr map'),
         help_text=_('User attr map present how to map OpenID user attr to '
                     'jumpserver, username,name,email is jumpserver attr')
diff --git a/apps/settings/serializers/auth/saml2.py b/apps/settings/serializers/auth/saml2.py
index d89f30577..9e0001218 100644
--- a/apps/settings/serializers/auth/saml2.py
+++ b/apps/settings/serializers/auth/saml2.py
@@ -30,6 +30,6 @@ class SAML2SettingSerializer(serializers.Serializer):
         allow_blank=True, required=False,
         write_only=True, label=_('SP cert')
     )
-    SAML2_RENAME_ATTRIBUTES = serializers.DictField(required=False, label=_('Rename attr'))
+    SAML2_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr'))
     SAML2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely'))
     AUTH_SAML2_ALWAYS_UPDATE_USER = serializers.BooleanField(required=False, label=_('Always update user'))
diff --git a/apps/settings/serializers/auth/sms.py b/apps/settings/serializers/auth/sms.py
index 60033c476..2a3e60530 100644
--- a/apps/settings/serializers/auth/sms.py
+++ b/apps/settings/serializers/auth/sms.py
@@ -96,7 +96,7 @@ class CustomSMSSettingSerializer(BaseSMSSettingSerializer):
         post = 'post', 'Post'
 
     CUSTOM_SMS_URL = serializers.URLField(required=True, label=_("URL"))
-    CUSTOM_SMS_API_PARAMS = serializers.DictField(
+    CUSTOM_SMS_API_PARAMS = serializers.JSONField(
         label=_('Parameters'), default={'phone_number': '{phone_number}', 'code': '{code}'}
     )
     CUSTOM_SMS_REQUEST_METHOD = serializers.ChoiceField(