You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ju...@apache.org on 2025/12/17 09:08:44 UTC
(tomee) branch main updated: TOMEE-4561 - make members of OpenIdContext serializable
This is an automated email from the ASF dual-hosted git repository.
jungm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 179958f4be TOMEE-4561 - make members of OpenIdContext serializable
179958f4be is described below
commit 179958f4bed52c414635b9ede3eb124293af5564
Author: Markus Jung <ju...@apache.org>
AuthorDate: Wed Dec 17 10:08:25 2025 +0100
TOMEE-4561 - make members of OpenIdContext serializable
---
.../org/apache/tomee/security/cdi/openid/OpenIdIdentityStore.java | 2 +-
.../org/apache/tomee/security/cdi/openid/TomEEOpenIdContext.java | 6 +++---
.../apache/tomee/security/http/openid/model/TomEEAccesToken.java | 3 ++-
.../apache/tomee/security/http/openid/model/TomEEIdentityToken.java | 3 ++-
.../apache/tomee/security/http/openid/model/TomEEJsonClaims.java | 4 +++-
.../apache/tomee/security/http/openid/model/TomEERefreshToken.java | 4 +++-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/OpenIdIdentityStore.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/OpenIdIdentityStore.java
index d125eba4af..d3c9512c0b 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/OpenIdIdentityStore.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/OpenIdIdentityStore.java
@@ -93,7 +93,7 @@ public class OpenIdIdentityStore implements IdentityStore {
openIdContext.setAccessToken(createAccessToken(defaultJwtConsumer, openIdCredential.getTokenResponse()));
openIdContext.setIdentityToken(createIdentityToken(idTokenJwtConsumer, openIdCredential.getTokenResponse()));
- openIdContext.setRefreshToken(openIdCredential.getTokenResponse().getRefreshToken().map(TomEERefreshToken::new));
+ openIdContext.setRefreshToken(openIdCredential.getTokenResponse().getRefreshToken().map(TomEERefreshToken::new).orElse(null));
if (openIdContext.getIdentityToken() == null) {
return CredentialValidationResult.INVALID_RESULT;
}
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/TomEEOpenIdContext.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/TomEEOpenIdContext.java
index 9afc9655fb..7703c0e3e3 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/TomEEOpenIdContext.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/cdi/openid/TomEEOpenIdContext.java
@@ -41,7 +41,7 @@ public class TomEEOpenIdContext implements OpenIdContext {
private AccessToken accessToken;
private IdentityToken identityToken;
- private Optional<RefreshToken> refreshToken;
+ private RefreshToken refreshToken;
private Long expiresIn;
@PostConstruct
@@ -74,7 +74,7 @@ public class TomEEOpenIdContext implements OpenIdContext {
@Override
public Optional<RefreshToken> getRefreshToken() {
- return refreshToken;
+ return Optional.ofNullable(refreshToken);
}
@Override
@@ -118,7 +118,7 @@ public class TomEEOpenIdContext implements OpenIdContext {
this.identityToken = identityToken;
}
- public void setRefreshToken(Optional<RefreshToken> refreshToken) {
+ public void setRefreshToken(RefreshToken refreshToken) {
this.refreshToken = refreshToken;
}
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEAccesToken.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEAccesToken.java
index 07b8371c62..51d36d0b67 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEAccesToken.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEAccesToken.java
@@ -27,11 +27,12 @@ import jakarta.security.enterprise.identitystore.openid.Scope;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import java.io.Serializable;
import java.io.StringReader;
import java.util.Base64;
import java.util.Map;
-public class TomEEAccesToken implements AccessToken {
+public class TomEEAccesToken implements AccessToken, Serializable {
private static final Logger LOGGER = Logger.getInstance(LogCategory.TOMEE_SECURITY, TomEEAccesToken.class);
private final boolean jwt;
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEIdentityToken.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEIdentityToken.java
index 0172f87ac8..911f05d0e3 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEIdentityToken.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEIdentityToken.java
@@ -26,11 +26,12 @@ import jakarta.security.enterprise.identitystore.openid.JwtClaims;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import java.io.Serializable;
import java.io.StringReader;
import java.util.Base64;
import java.util.Map;
-public class TomEEIdentityToken implements IdentityToken {
+public class TomEEIdentityToken implements IdentityToken, Serializable {
private static final Logger LOGGER = Logger.getInstance(LogCategory.TOMEE_SECURITY, TomEEIdentityToken.class);
private final String token;
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEJsonClaims.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEJsonClaims.java
index 8d077ffd7b..aa999bb692 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEJsonClaims.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEEJsonClaims.java
@@ -21,6 +21,8 @@ import jakarta.json.JsonObject;
import jakarta.json.JsonString;
import jakarta.json.JsonValue;
import jakarta.security.enterprise.identitystore.openid.Claims;
+
+import java.io.Serializable;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
@@ -29,7 +31,7 @@ import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.OptionalLong;
-public class TomEEJsonClaims implements Claims {
+public class TomEEJsonClaims implements Claims, Serializable {
private final JsonObject claims;
public TomEEJsonClaims(JsonObject claims) {
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEERefreshToken.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEERefreshToken.java
index 8a26d2cd01..c2fea9ca13 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEERefreshToken.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/http/openid/model/TomEERefreshToken.java
@@ -18,7 +18,9 @@ package org.apache.tomee.security.http.openid.model;
import jakarta.security.enterprise.identitystore.openid.RefreshToken;
-public class TomEERefreshToken implements RefreshToken {
+import java.io.Serializable;
+
+public class TomEERefreshToken implements RefreshToken, Serializable {
private final String token;
public TomEERefreshToken(String token) {