Skip to content

Commit 138e991

Browse files
committed
Include get_signing_certificate only if set.
1 parent 3bc2cf1 commit 138e991

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

example/src/main/java/eu/webeid/example/security/WebEidMobileAuthInitFilter.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@
2222

2323
package eu.webeid.example.security;
2424

25+
import com.fasterxml.jackson.annotation.JsonInclude;
2526
import com.fasterxml.jackson.annotation.JsonProperty;
2627
import com.fasterxml.jackson.databind.ObjectMapper;
2728
import com.fasterxml.jackson.databind.ObjectWriter;
29+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
30+
import com.fasterxml.jackson.databind.annotation.JsonNaming;
2831
import eu.webeid.example.config.WebEidMobileProperties;
2932
import eu.webeid.security.challenge.ChallengeNonceGenerator;
3033
import jakarta.servlet.FilterChain;
@@ -71,10 +74,9 @@ protected void doFilterInternal(@NonNull HttpServletRequest request,
7174
String loginUri = ServletUriComponentsBuilder.fromCurrentContextPath()
7275
.path(mobileLoginPath).build().toUriString();
7376

74-
boolean getSigningCertificate = webEidMobileProperties.requestSigningCert();
75-
7677
String payloadJson = OBJECT_WRITER.writeValueAsString(
77-
new AuthPayload(challenge.getBase64EncodedNonce(), loginUri, getSigningCertificate)
78+
new AuthPayload(challenge.getBase64EncodedNonce(), loginUri,
79+
webEidMobileProperties.requestSigningCert() ? Boolean.TRUE : null)
7880
);
7981
String encoded = Base64.getEncoder().encodeToString(payloadJson.getBytes(StandardCharsets.UTF_8));
8082
String eidAuthUri = "web-eid-mobile://auth#" + encoded;
@@ -83,12 +85,15 @@ protected void doFilterInternal(@NonNull HttpServletRequest request,
8385
OBJECT_WRITER.writeValue(response.getWriter(), new AuthUri(eidAuthUri));
8486
}
8587

88+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
89+
@JsonInclude(JsonInclude.Include.NON_NULL)
8690
record AuthPayload(
8791
String challenge,
88-
@JsonProperty("login_uri") String loginUri,
89-
@JsonProperty("get_signing_certificate") boolean getSigningCertificate) {
92+
String loginUri,
93+
Boolean getSigningCertificate) {
9094
}
9195

96+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
9297
record AuthUri(@JsonProperty("auth_uri") String authUri) {
9398
}
9499
}

0 commit comments

Comments
 (0)