[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] branch master updated: Wire transfer subject i
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-bank] branch master updated: Wire transfer subject is JSON containing exchange URL and reserve public key. |
Date: |
Sat, 04 Mar 2017 10:16:25 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 66e32bb Wire transfer subject is JSON containing exchange URL and
reserve public key.
66e32bb is described below
commit 66e32bbaf9ca647399673d916a504d1be6bb0839
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sat Mar 4 10:15:35 2017 +0100
Wire transfer subject is JSON containing exchange URL
and reserve public key.
---
talerbank/app/schemas.py | 1 +
talerbank/app/views.py | 12 ++++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/talerbank/app/schemas.py b/talerbank/app/schemas.py
index 5dfcbce..7821bfa 100644
--- a/talerbank/app/schemas.py
+++ b/talerbank/app/schemas.py
@@ -53,6 +53,7 @@ incoming_request_schema = {
"properties": {
"amount": {"type": amount_schema},
"wtid": {"type": "string"},
+ "exchange_url": {"type": "string"},
"credit_account": {"type": "integer"},
"debit_account": {"type": "integer"}
}
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index cc6d8ea..e55b6d6 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -304,7 +304,7 @@ def add_incoming(request):
This view is CSRF exempt, since it is not used from
within the browser, and only over the private admin interface.
"""
- logger.info("handling /admin/add/incoming")
+ logger.info("Handling /admin/add/incoming.")
logger.info(request.body.decode("utf-8"))
data = json.loads(request.body.decode("utf-8"))
logger.info(json.dumps(data))
@@ -312,16 +312,20 @@ def add_incoming(request):
schemas.validate_incoming_request(data)
except ValueError:
return HttpResponseBadRequest()
- logger.info("add_incoming for debit account %s and credit account %s, WTID
%s",
+ subject = dict(pub=data["wtid"], url=data["exchange_url"])
+ logger.info("add_incoming for debit account %s and credit account %s, WTID
'%s'.",
data["debit_account"],
data["credit_account"],
- data["wtid"])
+ json.dumps(subject, separators=(",", ":")))
try:
debit_account = user_account =
BankAccount.objects.get(user=data["debit_account"])
credit_account = user_account =
BankAccount.objects.get(user=data["credit_account"])
except BankAccount.DoesNotExist:
return HttpResponse(status=404)
- wire_transfer(data["amount"], debit_account, credit_account, data["wtid"])
+ wire_transfer(data["amount"],
+ debit_account,
+ credit_account,
+ json.dumps(subject, separators=(",", ":")))
return JsonResponse({"outcome": "ok"}, status=200)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-bank] branch master updated: Wire transfer subject is JSON containing exchange URL and reserve public key.,
gnunet <=