Skip to content

Commit 18805e5

Browse files
committed
fix: add user_id field to ApplicationKeySerializer and update key generation logic
1 parent 12c26b5 commit 18805e5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

apps/application/serializers/application_api_key.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class EditApplicationKeySerializer(serializers.Serializer):
3636
class ApplicationKeySerializer(serializers.Serializer):
3737
workspace_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Workspace ID"))
3838
application_id = serializers.UUIDField(required=True, label=_('application id'))
39+
user_id = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("User ID"))
3940
order_by = serializers.CharField(required=False, label=_('order by'), allow_null=True, allow_blank=True)
4041

4142
def is_valid(self, *, raise_exception=False):
@@ -51,11 +52,10 @@ def generate(self, with_valid=True):
5152
if with_valid:
5253
self.is_valid(raise_exception=True)
5354
application_id = self.data.get("application_id")
54-
application = QuerySet(Application).filter(id=application_id).first()
5555
secret_key = 'agent-' + hashlib.md5(str(uuid.uuid7()).encode()).hexdigest()
5656
application_api_key = ApplicationApiKey(id=uuid.uuid7(),
5757
secret_key=secret_key,
58-
user_id=application.user_id,
58+
user_id=self.data.get('user_id'),
5959
application_id=application_id)
6060
application_api_key.save()
6161
return ApplicationKeySerializerModel(application_api_key).data

apps/application/views/application_api_key.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ApplicationKey(APIView):
4848
)
4949
def post(self, request: Request, workspace_id: str, application_id: str):
5050
return result.success(ApplicationKeySerializer(
51-
data={'application_id': application_id, 'user_id': request.user.id,
51+
data={'application_id': application_id, 'user_id': str(request.user.id),
5252
'workspace_id': workspace_id}).generate())
5353

5454
class Page(APIView):

0 commit comments

Comments
 (0)