diff --git a/awx/api/serializers.py b/awx/api/serializers.py index f0ce4f1a3a..1e8fdc8f12 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -938,7 +938,7 @@ class UserAuthorizedTokenSerializer(BaseSerializer): '*', '-name', 'description', 'user', 'token', 'refresh_token', 'expires', 'scope', 'application', ) - read_only_fields = ('user', 'token', 'expires', 'application') + read_only_fields = ('user', 'token', 'expires') def get_token(self, obj): request = self.context.get('request', None) @@ -1045,7 +1045,7 @@ class OAuth2TokenSerializer(BaseSerializer): '*', '-name', 'description', 'user', 'token', 'refresh_token', 'application', 'expires', 'scope', ) - read_only_fields = ('user', 'token', 'expires', 'application') + read_only_fields = ('user', 'token', 'expires') def get_modified(self, obj): if obj is None: @@ -1104,6 +1104,20 @@ class OAuth2TokenSerializer(BaseSerializer): ) return obj + +class OAuth2TokenDetailSerializer(OAuth2TokenSerializer): + + refresh_token = serializers.SerializerMethodField() + token = serializers.SerializerMethodField() + + class Meta: + model = OAuth2AccessToken + fields = ( + '*', '-name', 'description', 'user', 'token', 'refresh_token', + 'application', 'expires', 'scope', + ) + read_only_fields = ('user', 'token', 'expires', 'application') + class OAuth2AuthorizedTokenSerializer(BaseSerializer): @@ -1116,7 +1130,7 @@ class OAuth2AuthorizedTokenSerializer(BaseSerializer): '*', '-name', 'description', 'user', 'token', 'refresh_token', 'expires', 'scope', 'application', ) - read_only_fields = ('user', 'token', 'expires', 'application',) + read_only_fields = ('user', 'token', 'expires') def get_token(self, obj): request = self.context.get('request', None) diff --git a/awx/api/views.py b/awx/api/views.py index a5f4a662b3..137df4d949 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1587,7 +1587,7 @@ class OAuth2TokenDetail(RetrieveUpdateDestroyAPIView): view_name = _("OAuth Token Detail") model = OAuth2AccessToken - serializer_class = OAuth2TokenSerializer + serializer_class = OAuth2TokenDetailSerializer class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):