From 5c211d58a879e69e2f66624a60f36275fffa1685 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Mon, 9 Jul 2018 10:18:44 +0200 Subject: [PATCH] portfolio: get origin from publisher (#25126) --- tests/test_form_pages.py | 6 ++++++ wcs/portfolio.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/test_form_pages.py b/tests/test_form_pages.py index 32c27ad3..5566035d 100644 --- a/tests/test_form_pages.py +++ b/tests/test_form_pages.py @@ -3094,6 +3094,12 @@ def test_formdata_generated_document_odt_to_pdf_download_push_to_portfolio(pub, http_post_request.return_value = None, 200, 'null', None resp = resp.form.submit('button_export_to') assert http_post_request.call_count == 1 + assert http_post_request.call_args[0][0].startswith('http://fargo.example.net/api/documents/push/') + payload = json.loads(http_post_request.call_args[0][1]) + assert payload['file_name'] == 'template.pdf' + assert payload['user_email'] == 'foo@localhost' + assert payload['origin'] == 'example.net' + assert payload['file_b64_content'].decode('base64').startswith('%PDF') assert ("file 'template.pdf' pushed to portfolio of 'Foo Bar\\xc3\\xa9'" == caplog.records[-1].message) assert resp.location == form_location diff --git a/wcs/portfolio.py b/wcs/portfolio.py index 6cf4f841..2d16f240 100644 --- a/wcs/portfolio.py +++ b/wcs/portfolio.py @@ -18,6 +18,7 @@ import json import urlparse import hashlib import urllib +import urlparse import base64 from qommon import get_logger @@ -88,7 +89,7 @@ def push_document(user, filename, stream): payload['user_nameid'] = unicode(user.name_identifiers[0], 'ascii') elif user.email: payload['user_email'] = unicode(user.email, 'ascii') - payload['origin'] = get_request().get_server().split(':')[0] + payload['origin'] = urlparse.urlparse(get_publisher().get_frontoffice_url()).netloc payload['file_name'] = unicode(filename, charset) stream.seek(0) payload['file_b64_content'] = base64.b64encode(stream.read()) -- 2.18.0