removed splunk logging due to correlation id bug (#137)

* Added Splunk logging required decorator to Token handler
* Added additional None checks to potential breaking areas

---------

Co-authored-by: Scott Alexander <[email protected]>

Author: SRAlexander

lambdas/handlers/token_handler.py

@@ -17,13 +17,14 @@
                               OrganisationNotFoundException,
                               TooManyOrgsException)
 from utils.lambda_response import ApiGatewayResponse
+from utils.decorators.set_audit_arg import set_request_context_for_logging
 
 logger = LoggingService(__name__)
 
 
 token_handler_ssm_service = TokenHandlerSSMService()
 
-
+@set_request_context_for_logging
 def lambda_handler(event, context):
     oidc_service = OidcService()
     ods_api_service = OdsApiService()

lambdas/utils/decorators/set_audit_arg.py

@@ -10,10 +10,11 @@ def interceptor(event, context):
         request_context.authorization = None
         if event.get("headers"):
             token = event.get("headers").get("Authorization")
-            decoded_token = jwt.decode(
-                token, algorithms=["RS256"], options={"verify_signature": False}
-            )
-            request_context.authorization = decoded_token
+            if token:
+                decoded_token = jwt.decode(
+                    token, algorithms=["RS256"], options={"verify_signature": False}
+                )
+                request_context.authorization = decoded_token
         return lambda_func(event, context)
 
     return interceptor

lambdas/utils/logging_formatter.py

@@ -6,11 +6,19 @@
 
 class LoggingFormatter(logging.Formatter):
     def format(self, record: logging.LogRecord) -> str:
+
+        auth = "No Auth"
+        if request_context.authorization is not None:
+            auth = request_context.authorization
+
         s = super().format(record)
         d = {
             "correlation_id": request_context.request_id,
-            "auth": request_context.authorization,
-            **record.__dict__.get("custom_args", {}),
-            "Message": s,
+            "auth": auth,
+            "Message": s
         }
+
+        if record.__dict__.get("custom_args", {}) is not None: 
+            d.update(record.__dict__.get("custom_args", {}))
+
         return json.dumps(d)