From 531692bcfe7bc27e2e09f772919ca4d0454bdb4f Mon Sep 17 00:00:00 2001 From: Manish Ram Date: Mon, 16 Nov 2026 19:24:03 -0800 Subject: [PATCH] fix(parser): accept Cognito pre token generation V2 and V3 events --- .../utilities/parser/models/cognito.py | 3 ++- tests/unit/parser/_pydantic/test_cognito_triggers.py | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/aws_lambda_powertools/utilities/parser/models/cognito.py b/aws_lambda_powertools/utilities/parser/models/cognito.py index b99d38b1cae..ec385c33309 100644 --- a/aws_lambda_powertools/utilities/parser/models/cognito.py +++ b/aws_lambda_powertools/utilities/parser/models/cognito.py @@ -96,10 +96,11 @@ class CognitoPreTokenGenerationTriggerModelV1(CognitoTriggerBaseSchema): class CognitoPreTokenGenerationRequestModelV2AndV3(CognitoPreTokenGenerationRequestModel): - scopes: dict[str, Any] | None = None + scopes: list[str] | None = None class CognitoPreTokenGenerationTriggerModelV2AndV3(CognitoTriggerBaseSchema): + triggerSource: str request: CognitoPreTokenGenerationRequestModelV2AndV3 response: dict[str, Any] = {} diff --git a/tests/unit/parser/_pydantic/test_cognito_triggers.py b/tests/unit/parser/_pydantic/test_cognito_triggers.py index 6399a5d36ff..db862d02b12 100644 --- a/tests/unit/parser/_pydantic/test_cognito_triggers.py +++ b/tests/unit/parser/_pydantic/test_cognito_triggers.py @@ -13,6 +13,7 @@ CognitoPreAuthenticationTriggerModel, CognitoPreSignupTriggerModel, CognitoPreTokenGenerationTriggerModelV1, + CognitoPreTokenGenerationTriggerModelV2AndV3, CognitoVerifyAuthChallengeTriggerModel, ) from tests.functional.utils import load_event @@ -27,6 +28,7 @@ ("cognitoPreAuthenticationEvent.json", CognitoPreAuthenticationTriggerModel), ("cognitoPostAuthenticationEvent.json", CognitoPostAuthenticationTriggerModel), ("cognitoPreTokenGenerationEvent.json", CognitoPreTokenGenerationTriggerModelV1), + ("cognitoPreTokenV2GenerationEvent.json", CognitoPreTokenGenerationTriggerModelV2AndV3), ("cognitoUserMigrationEvent.json", CognitoMigrateUserTriggerModel), ("cognitoCustomMessageEvent.json", CognitoCustomMessageTriggerModel), ("cognitoCustomEmailSenderEvent.json", CognitoCustomEmailSenderTriggerModel), @@ -150,3 +152,13 @@ def test_cognito_trigger_models_accept_null_client_id(): parsed = parse(event=event, model=CognitoPostConfirmationTriggerModel) assert parsed.callerContext.clientId is None + + +def test_cognito_pre_token_generation_v2_and_v3_model_keeps_scopes_and_trigger_source(): + # V2 and V3 events send scopes as a list of strings + event = load_event("cognitoPreTokenV2GenerationEvent.json") + + parsed = parse(event=event, model=CognitoPreTokenGenerationTriggerModelV2AndV3) + + assert parsed.request.scopes == ["aws.cognito.signin.user.admin"] + assert parsed.triggerSource == "TokenGeneration_Authentication"