feat: Refactor claims extraction to use decode_claims function across multiple handlers

Author: jbouse

lambda/activitylogs/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.activitylogs import ActivityLog
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Authorizer event: {event}")
     logger.debug(f"Authorizer context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/incidents/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.incidents import Incident
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Incidents event: {event}")
     logger.debug(f"Incidents context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/locations/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.locations import Location
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Locations event: {event}")
     logger.debug(f"Locations context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/organizations/handler.py

@@ -8,7 +8,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.organizations import Organization
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -40,7 +40,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Organizations event: {event}")
     logger.debug(f"Organizations context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/periods/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.periods import Period
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Periods event: {event}")
     logger.debug(f"Periods context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/radios/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.radios import Radio
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Radios event: {event}")
     logger.debug(f"Radios context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):

lambda/reports/handler.py

@@ -10,7 +10,7 @@
 from aws_lambda_typing.events import APIGatewayProxyEventV2
 from aws_lambda_typing.context import Context as LambdaContext
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -92,19 +92,19 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Reports event: {event}")
     logger.debug(f"Reports context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):
         try:
             claims = dict(claims)
         except Exception:
             claims = {}
-    org_id = claims.get('hd')
+    org_id = claims.get('org_id')
     if not org_id:
         return build_response(
             403,
-            {'error': 'Missing organization (hd claim) in token'},
+            {'error': 'Missing organization (org_id claim) in token'},
             headers=cors_headers
         )
 

lambda/units/handler.py

@@ -6,7 +6,7 @@
 from aws_lambda_typing.responses import APIGatewayProxyResponseV2
 from EventCoord.launchdarkly.flags import Flags
 from EventCoord.models.units import Unit
-from EventCoord.utils.response import build_response
+from EventCoord.utils.response import build_response, decode_claims
 from aws_xray_sdk.core import patch_all, xray_recorder
 
 patch_all()  # Automatically patches boto3, requests, etc.
@@ -38,7 +38,7 @@ def lambda_handler(
 ) -> APIGatewayProxyResponseV2:
     logger.debug(f"Units event: {event}")
     logger.debug(f"Units context: {context}")
-    claims = event.get('requestContext', {}).get('authorizer', {})
+    claims = decode_claims(event)
     if claims is None:
         claims = {}
     elif not isinstance(claims, dict):