Continue setting JsonWebKeySet appTid collection but mark API as depr…

…ecated
SAP · Sep 12, 2023 · 896d550 · 896d550
1 parent ed7c8b4
commit 896d550
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/...urity/src/main/java/com/sap/cloud/security/token/validation/validators/JsonWebKeySet.java b/...urity/src/main/java/com/sap/cloud/security/token/validation/validators/JsonWebKeySet.java
@@ -7,17 +7,16 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 class JsonWebKeySet {
 
 	private final Set<JsonWebKey> jsonWebKeys = new HashSet<>();
-	private final Map<String, Boolean> appTidAccepted = new HashMap<>();
+	@Deprecated
+	private final Set<String> appTidAccepted = new HashSet<>();
 
 	@Nullable
 	public JsonWebKey getKeyByAlgorithmAndId(JwtSignatureAlgorithm keyAlgorithm, String keyId) {
@@ -45,16 +44,24 @@ private Stream<JsonWebKey> getTokenStreamWithTypeAndKeyId(JwtSignatureAlgorithm
 				.filter(jwk -> kid.equals(jwk.getId()));
 	}
 
+	@Deprecated
 	public boolean containsAppTid(String appTid) {
-		return appTidAccepted.containsKey(appTid);
+		return appTidAccepted.contains(appTid);
 	}
 
+	@Deprecated
 	public boolean isAppTidAccepted(String appTid) {
-		return appTidAccepted.get(appTid);
+		return appTidAccepted.contains(appTid);
 	}
 
+	@Deprecated
 	public JsonWebKeySet withAppTid(String appTid, boolean isAccepted) {
-		appTidAccepted.put(appTid, isAccepted);
+		if(isAccepted) {
+			appTidAccepted.add(appTid);
+		} else {
+			appTidAccepted.remove(appTid);
+		}
+
 		return this;
 	}
 

diff --git a/...va/com/sap/cloud/security/token/validation/validators/OAuth2TokenKeyServiceWithCache.java b/...va/com/sap/cloud/security/token/validation/validators/OAuth2TokenKeyServiceWithCache.java
@@ -169,7 +169,7 @@ public PublicKey getPublicKey(JwtSignatureAlgorithm keyAlgorithm, String keyId,
     private JsonWebKeySet retrieveTokenKeysAndUpdateCache(CacheKey cacheKey) throws OAuth2ServiceException {
             String jwksJson = getTokenKeyService().retrieveTokenKeys(cacheKey.keyUri(), cacheKey.appTid(), cacheKey.clientId(), cacheKey.azp());
 
-            JsonWebKeySet keySet = JsonWebKeySetFactory.createFromJson(jwksJson);
+            JsonWebKeySet keySet = JsonWebKeySetFactory.createFromJson(jwksJson).withAppTid(cacheKey.appTid(), true);
             getCache().put(cacheKey.toString(), keySet);
 
             return keySet;