diff options
Diffstat (limited to 'macaroonbakery/httpbakery')
| -rw-r--r-- | macaroonbakery/httpbakery/_browser.py | 5 | ||||
| -rw-r--r-- | macaroonbakery/httpbakery/_client.py | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/macaroonbakery/httpbakery/_browser.py b/macaroonbakery/httpbakery/_browser.py index a1ccbb0..c8a5586 100644 --- a/macaroonbakery/httpbakery/_browser.py +++ b/macaroonbakery/httpbakery/_browser.py @@ -85,5 +85,6 @@ class WebBrowserInteractionInfo(namedtuple('WebBrowserInteractionInfo', @param info_dict The deserialized JSON object @return a new WebBrowserInteractionInfo object. ''' - return WebBrowserInteractionInfo(visit_url=info_dict.get('VisitURL'), - wait_token_url=info_dict('WaitURL')) + return WebBrowserInteractionInfo( + visit_url=info_dict.get('VisitURL'), + wait_token_url=info_dict.get('WaitTokenURL')) diff --git a/macaroonbakery/httpbakery/_client.py b/macaroonbakery/httpbakery/_client.py index d877140..4fe0ab1 100644 --- a/macaroonbakery/httpbakery/_client.py +++ b/macaroonbakery/httpbakery/_client.py @@ -320,8 +320,11 @@ def extract_macaroons(headers_or_request): mss = [] def add_macaroon(data): - data = utils.b64decode(data) - data_as_objs = json.loads(data.decode('utf-8')) + try: + data = utils.b64decode(data) + data_as_objs = json.loads(data.decode('utf-8')) + except ValueError: + return ms = [utils.macaroon_from_dict(x) for x in data_as_objs] mss.append(ms) |