Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions custom-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<artifactId>aws-lambda-java-events</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-iam</artifactId>
<groupId>software.amazon.awssdk</groupId>
<artifactId>iam</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
8 changes: 4 additions & 4 deletions jwt-authorizer/Authorizer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<version.encoder>1.2.3</version.encoder>
<version.lambda-core>1.2.3</version.lambda-core>
<version.lambda-events>3.15.0</version.lambda-events>
<version.lambda-iam>1.12.745</version.lambda-iam>
<version.lambda-awssdk>2.31.2</version.lambda-awssdk>
<version.jose4j>0.9.6</version.jose4j>
<version.logback>1.5.16</version.logback>
<version.junit>5.11.3</version.junit>
Expand Down Expand Up @@ -64,9 +64,9 @@
<version>${version.lambda-events}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-iam</artifactId>
<version>${version.lambda-iam}</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>iam</artifactId>
<version>${version.lambda-awssdk}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.amazonaws.services.lambda.runtime.Context;
import com.amazonaws.services.lambda.runtime.RequestHandler;
import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.config.JsonMapper;
import com.networknt.utility.Constants;
Expand Down Expand Up @@ -55,11 +54,11 @@ public AuthPolicy handleRequest(APIGatewayProxyRequestEvent request, Context con
// handle the primary token.
String clientId = claims.getStringClaimValue(Constants.CLIENT_ID_STRING);
// try to get the cid as some OAuth tokens name it as cid like Okta.
if(clientId == null) clientId = claims.getStringClaimValue(Constants.CID_STRING);
if(clientId == null) clientId = claims.getStringClaimValue(Constants.CID);
ctx.put(Constants.CLIENT_ID_STRING, clientId);
String userId = claims.getStringClaimValue(Constants.USER_ID_STRING);
// try to get the uid as some OAuth tokens name it as uid like Okta.
if(userId == null) userId = claims.getStringClaimValue(Constants.UID_STRING);
if(userId == null) userId = claims.getStringClaimValue(Constants.UID);
if(userId != null) {
ctx.put(Constants.USER_ID_STRING, userId);
principalId = userId;
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@
<version>${version.lambda-events}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-iam</artifactId>
<version>${version.lambda-iam}</version>
<groupId>software.amazon.awssdk</groupId>
<artifactId>iam</artifactId>
<version>${version.lambda-awssdk}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
Expand Down