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

fix: connect token serializer

pull/9128/head
Eric 2022-11-28 15:31:00 +08:00
parent 2c26f96e28
commit 3c5b459ab7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/models/connection_token.py
View File

@ -136,7 +136,7 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
'name': account.name, 'name': account.name,
'username': account.username, 'username': account.username,
'secret_type': account.secret_type, 'secret_type': account.secret_type,
'secret': account.secret_type or self.secret 'secret': account.secret or self.secret
} }
@lazyproperty @lazyproperty

5
apps/authentication/serializers/connection_token.py
View File

@ -1,8 +1,8 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from assets.serializers import PlatformSerializer
from assets.models import Asset, Domain, CommandFilterRule, Account, Platform from assets.models import Asset, Domain, CommandFilterRule, Account, Platform
from assets.serializers import PlatformSerializer, AssetProtocolsSerializer
from authentication.models import ConnectionToken from authentication.models import ConnectionToken
from orgs.mixins.serializers import OrgResourceModelSerializerMixin from orgs.mixins.serializers import OrgResourceModelSerializerMixin
from perms.serializers.permission import ActionChoicesField from perms.serializers.permission import ActionChoicesField
@ -87,6 +87,7 @@ class ConnectionTokenUserSerializer(serializers.ModelSerializer):
class ConnectionTokenAssetSerializer(serializers.ModelSerializer): class ConnectionTokenAssetSerializer(serializers.ModelSerializer):
""" Asset """ """ Asset """
protocols = AssetProtocolsSerializer(many=True, required=False, label=_('Protocols'))
class Meta: class Meta:
model = Asset model = Asset
@ -99,7 +100,7 @@ class ConnectionTokenAccountSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Account model = Account
fields = [ fields = [
'name', 'username', 'secret_type', 'secret', 'name', 'username', 'secret_type', 'secret',
] ]