Skip to content

Commit 898a1b8

Browse files
committed
Revert "Switched from json annotations to custom deserializer"
This reverts commit 004438a.
1 parent 004438a commit 898a1b8

File tree

2 files changed

+11
-72
lines changed

2 files changed

+11
-72
lines changed

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/model/CognitoAuthorizerClaims.java

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
package com.amazonaws.serverless.proxy.internal.model;
1414

1515

16-
import com.amazonaws.serverless.proxy.internal.serialization.CognitoAuthorizerClaimsDeserializer;
16+
import com.fasterxml.jackson.annotation.JsonProperty;
1717

18-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
18+
import java.time.format.DateTimeFormatter;
1919

2020

2121
/**
@@ -36,25 +36,31 @@
3636
* }
3737
* </pre>
3838
*/
39-
@JsonDeserialize(using = CognitoAuthorizerClaimsDeserializer.class)
4039
public class CognitoAuthorizerClaims {
4140

4241
//-------------------------------------------------------------
4342
// Variables - Private
4443
//-------------------------------------------------------------
4544

45+
@JsonProperty(value = "sub")
4646
private String subject;
47+
@JsonProperty(value = "aud")
4748
private String audience;
49+
@JsonProperty(value = "iss")
4850
private String issuer;
51+
@JsonProperty(value = "token_use")
4952
private String tokenUse;
53+
@JsonProperty(value = "cognito:username")
5054
private String username;
5155
private String email;
56+
@JsonProperty(value = "email_verified")
5257
private boolean emailVerified;
58+
@JsonProperty(value = "auth_time")
5359
private Long authTime;
60+
@JsonProperty(value = "exp")
5461
private String expiration;
62+
@JsonProperty(value = "iat")
5563
private String issuedAt;
56-
private String phoneNumber;
57-
private boolean phoneNumberVerified;
5864

5965

6066
//-------------------------------------------------------------
@@ -157,24 +163,4 @@ public String getIssuedAt() {
157163
public void setIssuedAt(String issuedAt) {
158164
this.issuedAt = issuedAt;
159165
}
160-
161-
162-
public String getPhoneNumber() {
163-
return phoneNumber;
164-
}
165-
166-
167-
public void setPhoneNumber(String phoneNumber) {
168-
this.phoneNumber = phoneNumber;
169-
}
170-
171-
172-
public boolean isPhoneNumberVerified() {
173-
return phoneNumberVerified;
174-
}
175-
176-
177-
public void setPhoneNumberVerified(boolean phoneNumberVerified) {
178-
this.phoneNumberVerified = phoneNumberVerified;
179-
}
180166
}

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/serialization/CognitoAuthorizerClaimsDeserializer.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)