From f772335c60280a1a4c62f86ef3f6fe57d6ebed46 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 3 Jul 2020 12:55:54 -0400
Subject: [PATCH] Put the response code and body into an exception
---
src/_zkapauthorizer/controller.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/_zkapauthorizer/controller.py b/src/_zkapauthorizer/controller.py
index c2ace39..885d205 100644
--- a/src/_zkapauthorizer/controller.py
+++ b/src/_zkapauthorizer/controller.py
@@ -33,6 +33,7 @@ from functools import (
)
from json import (
dumps,
+ loads,
)
from datetime import (
timedelta,
@@ -75,7 +76,7 @@ from twisted.web.client import (
Agent,
)
from treq import (
- json_content,
+ content,
)
from treq.client import (
HTTPClient,
@@ -533,11 +534,12 @@ class RistrettoRedeemer(object):
}),
headers={b"content-type": b"application/json"},
)
+ response_body = yield content(response)
+
try:
- result = yield json_content(response)
+ result = loads(response_body)
except ValueError:
- self._log.failure("Parsing redeem response failed", response=response)
- raise
+ raise UnexpectedResponse(response.code, response_body)
success = result.get(u"success", False)
if not success:
--
GitLab