summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMS <ms@taler.net>2020-07-22 17:18:23 +0200
committerMS <ms@taler.net>2020-07-22 17:18:23 +0200
commit4231d0d5bb576aa3d742a75567f017355496059e (patch)
treee48b84c66d3d1c15d662eaf11135aaee044a452f
parent4c364161fabffb95bdf5443037cf67f5ec208aa1 (diff)
downloadtaler-merchant-demos-4231d0d5bb576aa3d742a75567f017355496059e.tar.gz
taler-merchant-demos-4231d0d5bb576aa3d742a75567f017355496059e.tar.bz2
taler-merchant-demos-4231d0d5bb576aa3d742a75567f017355496059e.zip
reducing code
-rw-r--r--talermerchantdemos/donations/donations.py47
1 files changed, 3 insertions, 44 deletions
diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py
index c6c03e5..08b4cfe 100644
--- a/talermerchantdemos/donations/donations.py
+++ b/talermerchantdemos/donations/donations.py
@@ -32,6 +32,7 @@ import urllib
import uuid
from taler.util.talerconfig import TalerConfig
from urllib.parse import urljoin, parse_qsl
+from .httpcommon import backend_post, backend_get
LOGGER = logging.getLogger(__name__)
@@ -81,26 +82,7 @@ def err_abort(abort_status_code, **params):
# if something unexpected happens.
def backend_instanced_get(instance, endpoint, params):
backend_url = urljoin(BACKEND_BASE_URL, f"instances/{instance}/")
- headers = {"Authorization": "ApiKey " + APIKEY}
- try:
- resp = requests.get(
- urljoin(backend_url, endpoint), params=params, headers=headers
- )
- except requests.ConnectionError:
- err_abort(500, message="Could not establish connection to backend")
- try:
- response_json = resp.json()
- except ValueError:
- err_abort(500, message="Could not parse response from backend")
- if resp.status_code != 200:
- err_abort(
- 500,
- message="Backend returned error status",
- json=response_json,
- status_code=resp.status_code
- )
- return response_json
-
+ return backend_get(backend_url, endpoint, params)
##
# POST a request to the backend, and return a error
@@ -112,30 +94,7 @@ def backend_instanced_get(instance, endpoint, params):
# @return the backend response (JSON format).
def backend_instanced_post(instance, endpoint, json):
backend_url = urljoin(BACKEND_BASE_URL, f"instances/{instance}/")
- headers = {"Authorization": "ApiKey " + APIKEY}
- try:
- resp = requests.post(
- urljoin(backend_url, endpoint), json=json, headers=headers
- )
- except requests.ConnectionError:
- err_abort(500, message=f"Could not establish connection to backend (url={url})")
- try:
- response_json = resp.json()
- except ValueError:
- err_abort(
- 500,
- message="Could not parse response from backend",
- status_code=resp.status_code
- )
- if resp.status_code != 200:
- err_abort(
- 500,
- message="Backend returned error status",
- json=response_json,
- status_code=resp.status_code
- )
- return response_json
-
+ return backend_post(backend_url, endpoint, params)
##
# Inspect GET arguments in the look for a parameter.