Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

This commit is contained in:
ibuler
2023-10-13 15:26:22 +08:00
13 changed files with 228 additions and 127 deletions

View File

@@ -12,6 +12,7 @@ from ..models import AccessKey, TempToken
__all__ = [
'AccessKeySerializer', 'BearerTokenSerializer',
'SSOTokenSerializer', 'TempTokenSerializer',
'AccessKeyCreateSerializer'
]
@@ -22,6 +23,11 @@ class AccessKeySerializer(serializers.ModelSerializer):
read_only_fields = ['id', 'date_created', 'date_last_used']
class AccessKeyCreateSerializer(AccessKeySerializer):
class Meta(AccessKeySerializer.Meta):
fields = AccessKeySerializer.Meta.fields + ['secret']
class BearerTokenSerializer(serializers.Serializer):
username = serializers.CharField(allow_null=True, required=False, write_only=True)
password = serializers.CharField(write_only=True, allow_null=True,