Skip to content

Commit 1f46c7e

Browse files
committed
Fixed tests for #24
1 parent 4f1e773 commit 1f46c7e

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/jaxrs/AwsProxySecurityContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public boolean isSecure() {
9090

9191

9292
public String getAuthenticationScheme() {
93-
if (event.getRequestContext().getAuthorizer().getClaims() != null && event.getRequestContext().getAuthorizer().getClaims().getSubject() != null) {
93+
if (event.getRequestContext().getAuthorizer() != null && event.getRequestContext().getAuthorizer().getClaims() != null && event.getRequestContext().getAuthorizer().getClaims().getSubject() != null) {
9494
return AUTH_SCHEME_COGNITO_POOL;
9595
} else if (event.getRequestContext().getAuthorizer() != null) {
9696
return AUTH_SCHEME_CUSTOM;

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import com.amazonaws.serverless.proxy.internal.model.ApiGatewayRequestContext;
1717
import com.amazonaws.serverless.proxy.internal.model.ApiGatewayRequestIdentity;
1818
import com.amazonaws.serverless.proxy.internal.model.AwsProxyRequest;
19+
import com.amazonaws.serverless.proxy.internal.model.CognitoAuthorizerClaims;
20+
1921
import com.fasterxml.jackson.core.JsonProcessingException;
2022
import com.fasterxml.jackson.databind.ObjectMapper;
2123

@@ -167,6 +169,12 @@ public AwsProxyRequestBuilder authorizerContextValue(String key, String value) {
167169
public AwsProxyRequestBuilder cognitoUserPool(String identityId) {
168170
this.request.getRequestContext().getIdentity().setCognitoAuthenticationType("POOL");
169171
this.request.getRequestContext().getIdentity().setCognitoIdentityId(identityId);
172+
if (this.request.getRequestContext().getAuthorizer() == null) {
173+
this.request.getRequestContext().setAuthorizer(new ApiGatewayAuthorizerContext());
174+
}
175+
this.request.getRequestContext().getAuthorizer().setClaims(new CognitoAuthorizerClaims());
176+
this.request.getRequestContext().getAuthorizer().getClaims().setSubject(identityId);
177+
170178
return this;
171179
}
172180

0 commit comments

Comments
 (0)