Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Enketo error Unable to auto-detect delimiting character; defaulted to ',' #909

Merged
merged 2 commits into from
Dec 6, 2023
Merged

Fix Enketo error Unable to auto-detect delimiting character; defaulted to ',' #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5858354
Use ServiceAccount token to fetch paired data XML from KPI
noliveleger Nov 29, 2023
a5b1110
Fix 500 when accessing metadata endpoint directly
noliveleger Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions onadata/apps/api/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
HttpResponseRedirect,
)
from django.utils.translation import gettext as t
from kobo_service_account.utils import get_real_user
from kobo_service_account.utils import get_real_user, get_request_headers
from rest_framework import exceptions
from rest_framework.authtoken.models import Token
from rest_framework.request import Request
Expand All @@ -31,8 +31,6 @@
from onadata.libs.utils.logger_tools import (
publish_form,
response_with_mimetype_and_name,
OPEN_ROSA_VERSION_HEADER,
OPEN_ROSA_VERSION,
)
from onadata.libs.utils.user_auth import (
check_and_set_form_by_id,
Expand Down Expand Up @@ -213,12 +211,12 @@ def get_media_file_response(
# an HTTP redirection. We use KoBoCAT to proxy the response from KPI
headers = {}
if not request.user.is_anonymous:
token = Token.objects.get(user=request.user)
headers['Authorization'] = f'Token {token.key}'
headers = get_request_headers(request.user.username)

# Send the request internally to avoid extra traffic on the public interface
internal_url = metadata.data_value.replace(settings.KOBOFORM_URL,
settings.KOBOFORM_INTERNAL_URL)
internal_url = metadata.data_value.replace(
settings.KOBOFORM_URL, settings.KOBOFORM_INTERNAL_URL
)
response = requests.get(internal_url, headers=headers)

return HttpResponse(
Expand Down
9 changes: 5 additions & 4 deletions onadata/apps/api/viewsets/metadata_viewset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,11 @@ class MetaDataViewSet(viewsets.ModelViewSet):
def retrieve(self, request, *args, **kwargs):
self.object = self.get_object()

if isinstance(request.accepted_renderer, MediaFileRenderer) \
and self.object.data_file is not None:

return get_media_file_response(self.object)
if (
isinstance(request.accepted_renderer, MediaFileRenderer)
and self.object.data_file is not None
):
return get_media_file_response(self.object, request)

serializer = self.get_serializer(self.object)

Expand Down