From 515e1faad42be2096dd1857ccfaa8ee007dac77a Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 19 Oct 2021 00:31:25 +0200 Subject: [PATCH] return json rsponse on webhooks --- InvenTree/common/api.py | 6 +++--- InvenTree/common/models.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/InvenTree/common/api.py b/InvenTree/common/api.py index 9624d85a9d..aa04715de6 100644 --- a/InvenTree/common/api.py +++ b/InvenTree/common/api.py @@ -7,12 +7,12 @@ from __future__ import unicode_literals import json +from django.http.response import JsonResponse from django.utils.decorators import method_decorator from django.urls import path from django.views.decorators.csrf import csrf_exempt from rest_framework.views import APIView -from rest_framework.response import Response from rest_framework.exceptions import NotAcceptable, NotFound from django_q.tasks import async_task @@ -60,8 +60,8 @@ class WebhookView(CsrfExemptMixin, APIView): message.save() # return results - return_kwargs = self.webhook.get_result(payload, headers, request) - return Response(**return_kwargs) + data = self.webhook.get_result(payload, headers, request) + return JsonResponse(data) def _process_payload(self, message_id): message = WebhookMessage.objects.get(message_id=message_id) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 023e4e7c18..630a8d03da 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1373,10 +1373,8 @@ class WebhookEndpoint(models.Model): return True def get_result(self, payload, headers=None, request=None): - context = {} - context['data'] = {'message': self.MESSAGE_OK} - context['status'] = 200 - return context + data = {'message': self.MESSAGE_OK} + return data class WebhookMessage(models.Model):