[GNUnet-SVN] [taler-merchant-frontends] branch master updated: fix crashes about /refund

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new a4880c1  fix crashes about /refund
a4880c1 is described below

commit a4880c13afc301654e3be456d2724c4bd6cada65
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Jun 21 17:22:34 2017 +0200

    fix crashes about /refund
---
 talerfrontends/blog/blog.py | 15 +++++++++------
 talerfrontends/helpers.py   |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index 94bd361..dfc2e1a 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -77,11 +77,14 @@ def javascript_licensing():
 
 # Triggers the refund by serving /refund/test?order_id=XY.
 # Will be triggered by a "refund button".
address@hidden("/refund/test", methods=["GET, POST"])
address@hidden("/refund/test", methods=["GET", "POST"])
 def refund():
-    # If POST, will fetch this value from the state
-    order_id = expect_parameter("order_id")
-    if request.method == "POST":
+
+    # In production, will fetch this value from the state
+    order_id = expect_parameter("order_id", 0)
+    assert(order_id != 0) 
+
+    if flask.request.method == "POST":
         r = requests.post(urljoin(BACKEND_URL, "refund"),
                           json=dict(order_id=order_id,
                                     refund=dict(value=1, fraction=0, 
currency=CURRENCY),
@@ -99,9 +102,9 @@ def refund():
             logger.error("Backend error (NO JSON returned): status code: " + 
str(r.status_code))
             return flask.jsonify(dict(error="Backend died, no JSON got from 
it")), 502
 
-    if request.method == "POST":
+    if flask.request.method == "POST":
         response = flask.make_response()
-        response.headers["X-Taler-Refund-Url"] = make_url("/refund", 
("order_id", order_id))
+        response.headers["X-Taler-Refund-Url"] = make_url("/refund/test", 
("order_id", order_id))
         return response
     else:
         return flask.jsonify(r.json()), r.status_code
diff --git a/talerfrontends/helpers.py b/talerfrontends/helpers.py
index d406bb1..99aaa1a 100644
--- a/talerfrontends/helpers.py
+++ b/talerfrontends/helpers.py
@@ -16,6 +16,7 @@
 #  @author Marcello Stanisci
 
 from flask import request, jsonify, make_response, current_app, render_template
+import flask
 from urllib.parse import urljoin, urlencode
 import logging
 import requests

-- 
To stop receiving notification emails like this one, please contact
address@hidden