github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 社区版去掉一些东西

pull/13143/head
wangruidong 2024-04-25 16:12:53 +08:00 committed by Bryan
parent 5be399616b
commit 5135186961
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/settings/serializers/public.py
View File

@ -42,6 +42,7 @@ class PrivateSettingSerializer(PublicSettingSerializer):
AUTH_DINGTALK = serializers.BooleanField() AUTH_DINGTALK = serializers.BooleanField()
AUTH_FEISHU = serializers.BooleanField() AUTH_FEISHU = serializers.BooleanField()
AUTH_LARK = serializers.BooleanField() AUTH_LARK = serializers.BooleanField()
AUTH_SLACK = serializers.BooleanField()
AUTH_TEMP_TOKEN = serializers.BooleanField() AUTH_TEMP_TOKEN = serializers.BooleanField()
TERMINAL_RAZOR_ENABLED = serializers.BooleanField() TERMINAL_RAZOR_ENABLED = serializers.BooleanField()

9
apps/users/serializers/user.py
View File

@ -3,6 +3,7 @@
from functools import partial from functools import partial
from django.conf import settings
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
@ -181,7 +182,11 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, ResourceLa
"is_otp_secret_key_bound": {"label": _("Is OTP bound")}, "is_otp_secret_key_bound": {"label": _("Is OTP bound")},
'mfa_level': {'label': _("MFA level")}, 'mfa_level': {'label': _("MFA level")},
} }
if not settings.XPACK_LICENSE_IS_VALID:
# 社区版去掉企业微信、钉钉、飞书、Lark、Slack
fields = [f for f in fields if f not in ["wecom_id", "dingtalk_id",
"feishu_id", "lark_id", "slack_id"]]
def get_fields(self): def get_fields(self):
fields = super().get_fields() fields = super().get_fields()
self.pop_fields_if_need(fields) self.pop_fields_if_need(fields)
@ -192,7 +197,7 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, ResourceLa
if not current_org.is_root(): if not current_org.is_root():
for f in self.Meta.fields_only_root_org: for f in self.Meta.fields_only_root_org:
fields.pop(f, None) fields.pop(f, None)
def validate_password(self, password): def validate_password(self, password):
password_strategy = self.initial_data.get("password_strategy") password_strategy = self.initial_data.get("password_strategy")
if self.instance is None and password_strategy != PasswordStrategy.custom: if self.instance is None and password_strategy != PasswordStrategy.custom: