summaryrefslogtreecommitdiff
path: root/talerblog/blog/blog.py
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-01-04 10:55:06 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2018-01-04 10:55:06 +0100
commit8d8aade1608755824541b6151acc2111ed07db3f (patch)
treec14c413be9dae597aa4990aebd4499aa25af1a71 /talerblog/blog/blog.py
parent078cac0ccad168072c69dfc89f46a29a0dc2b7e2 (diff)
downloadblog-8d8aade1608755824541b6151acc2111ed07db3f.tar.gz
blog-8d8aade1608755824541b6151acc2111ed07db3f.tar.bz2
blog-8d8aade1608755824541b6151acc2111ed07db3f.zip
done with /refund test case
Diffstat (limited to 'talerblog/blog/blog.py')
-rw-r--r--talerblog/blog/blog.py28
1 files changed, 10 insertions, 18 deletions
diff --git a/talerblog/blog/blog.py b/talerblog/blog/blog.py
index 54d77f0..fb3bbe8 100644
--- a/talerblog/blog/blog.py
+++ b/talerblog/blog/blog.py
@@ -33,25 +33,20 @@ from ..helpers import (make_url, \
from ..blog.content import (ARTICLES, \
get_article_file, get_image_file)
-LOGGER = logging.getLogger(__name__)
-
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-
app = flask.Flask(__name__, template_folder=BASE_DIR)
app.debug = True
app.secret_key = base64.b64encode(os.urandom(64)).decode('utf-8')
+LOGGER = logging.getLogger(__name__)
TC = TalerConfig.from_env()
-
BACKEND_URL = TC["frontends"]["backend"].value_string(required=True)
CURRENCY = TC["taler"]["currency"].value_string(required=True)
INSTANCE = TC["blog"]["instance"].value_string(required=True)
-
ARTICLE_AMOUNT = dict(value=0, fraction=50000000, currency=CURRENCY)
app.config.from_object(__name__)
-
@app.context_processor
def utility_processor():
def url(my_url):
@@ -60,14 +55,12 @@ def utility_processor():
return os.environ.get(name, default)
return dict(url=url, env=env)
-
@app.route("/")
def index():
return flask.render_template("templates/index.html",
merchant_currency=CURRENCY,
articles=ARTICLES.values())
-
@app.route("/javascript")
def javascript_licensing():
return flask.render_template("templates/javascript.html")
@@ -95,16 +88,15 @@ def refund():
response.headers["X-Taler-Refund-Url"] = make_url("/refund", ("order_id", order_id))
return response, 402
- else:
- order_id = expect_parameter("order_id", False)
- if not order_id:
- LOGGER.error("Missing parameter 'order_id'")
- return flask.jsonify(dict(error="Missing parameter 'order_id'")), 400
- resp = requests.get(urljoin(BACKEND_URL, "refund"),
- params=dict(order_id=order_id, instance=INSTANCE))
- if resp.status_code != 200:
- return backend_error(resp)
- return flask.jsonify(resp.json()), resp.status_code
+ order_id = expect_parameter("order_id", False)
+ if not order_id:
+ LOGGER.error("Missing parameter 'order_id'")
+ return flask.jsonify(dict(error="Missing parameter 'order_id'")), 400
+ resp = requests.get(urljoin(BACKEND_URL, "refund"),
+ params=dict(order_id=order_id, instance=INSTANCE))
+ if resp.status_code != 200:
+ return backend_error(resp)
+ return flask.jsonify(resp.json()), resp.status_code
@app.route("/generate-contract", methods=["GET"])