From 7135198a30d076cb9e83511121d6a1cabfc3d196 Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Jun 2020 12:56:18 -0700 Subject: [PATCH 1/4] Get response as string instead of bytes --- functions/security/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/security/main.py b/functions/security/main.py index 397bb2404d7..5bb7e9aaee4 100644 --- a/functions/security/main.py +++ b/functions/security/main.py @@ -32,7 +32,7 @@ def calling_function(request): # Fetch the token token_response = requests.get(token_full_url, headers=token_headers) - jwt = token_response.content + jwt = token_response.text # Provide the token in the request to the receiving function function_headers = {'Authorization': f'bearer {jwt}'} From fa5056d1b744da8f59c9a791929505885c44d9fd Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Jun 2020 13:40:10 -0700 Subject: [PATCH 2/4] Mock the correct property for string --- functions/security/main_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/security/main_test.py b/functions/security/main_test.py index bf86eea01f0..5d46a3a6374 100644 --- a/functions/security/main_test.py +++ b/functions/security/main_test.py @@ -19,8 +19,8 @@ class Response(object): - def __init__(self, content=u''): - self.content = content + def __init__(self, text=u''): + self.text = content @mock.patch("main.requests") From e9709fb8522400a1cabd254aee9a69b680c30424 Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Jun 2020 13:59:54 -0700 Subject: [PATCH 3/4] Typo --- functions/security/main_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/security/main_test.py b/functions/security/main_test.py index 5d46a3a6374..b603547a3bd 100644 --- a/functions/security/main_test.py +++ b/functions/security/main_test.py @@ -20,7 +20,7 @@ class Response(object): def __init__(self, text=u''): - self.text = content + self.text = text @mock.patch("main.requests") From 558195231f62e120eaa1efcbbb9a8b749848cafe Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Thu, 11 Jun 2020 14:04:41 -0700 Subject: [PATCH 4/4] Missed fixing a mock response check --- functions/security/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/security/main.py b/functions/security/main.py index 5bb7e9aaee4..0fd5c762187 100644 --- a/functions/security/main.py +++ b/functions/security/main.py @@ -38,5 +38,5 @@ def calling_function(request): function_headers = {'Authorization': f'bearer {jwt}'} function_response = requests.get(function_url, headers=function_headers) - return function_response.content + return function_response.text # [END functions_bearer_token]