Merge branch 'develop' into chore-housekeeping

Author: Michael Brewer

Diff for: aws_lambda_powertools/utilities/data_classes/common.py

@@ -65,7 +65,7 @@ def body(self) -> Optional[str]:
     @property
     def json_body(self) -> Any:
         """Parses the submitted body as json"""
-        return json.loads(self["body"])
+        return json.loads(self.decoded_body)
 
     @property
     def decoded_body(self) -> str:

Diff for: poetry.lock

@@ -49,7 +49,7 @@ radon = "^4.5.0"
 xenon = "^0.7.3"
 flake8-eradicate = "^1.1.0"
 flake8-bugbear = "^21.3.2"
-mkdocs-material = "^7.2.0"
+mkdocs-material = "^7.2.1"
 mkdocs-git-revision-date-plugin = "^0.3.1"
 mike = "^0.6.0"
 mypy = "^0.910"

Diff for: pyproject.toml

@@ -1037,6 +1037,18 @@ def test_base_proxy_event_decode_body_encoded_true():
     assert event.decoded_body == data
 
 
+def test_base_proxy_event_json_body_with_base64_encoded_data():
+    # GIVEN a base64 encoded json body
+    data = {"message": "Foo"}
+    data_str = json.dumps(data)
+    encoded_data = base64.b64encode(data_str.encode()).decode()
+    event = BaseProxyEvent({"body": encoded_data, "isBase64Encoded": True})
+
+    # WHEN calling json_body
+    # THEN then base64 decode and json load
+    assert event.json_body == data
+
+
 def test_kinesis_stream_event():
     event = KinesisStreamEvent(load_event("kinesisStreamEvent.json"))