From 19a2ca2fa53cc90c2aa95c5cdd10f8f2f599a538 Mon Sep 17 00:00:00 2001 From: HerrDerb Date: Mon, 29 Sep 2025 10:09:55 +0200 Subject: [PATCH] Use java.nio chartsets instead of nimbusds --- .../msal4jextensions/PersistenceTokenCacheAccessAspect.java | 6 +++--- .../msal4jextensions/persistence/linux/KeyRingAccessor.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/PersistenceTokenCacheAccessAspect.java b/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/PersistenceTokenCacheAccessAspect.java index 12ff2ad2..326a0513 100644 --- a/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/PersistenceTokenCacheAccessAspect.java +++ b/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/PersistenceTokenCacheAccessAspect.java @@ -9,13 +9,13 @@ import com.microsoft.aad.msal4jextensions.persistence.ICacheAccessor; import com.microsoft.aad.msal4jextensions.persistence.linux.KeyRingAccessor; import com.microsoft.aad.msal4jextensions.persistence.mac.KeyChainAccessor; -import com.nimbusds.jose.util.StandardCharset; import com.sun.jna.Platform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; /** @@ -124,7 +124,7 @@ public void beforeCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext) } byte[] data = cacheAccessor.read(); if (data != null) { - iTokenCacheAccessContext.tokenCache().deserialize(new String(data, StandardCharset.UTF_8)); + iTokenCacheAccessContext.tokenCache().deserialize(new String(data, StandardCharsets.UTF_8)); } updateLastSeenCacheFileModifiedTimestamp(); @@ -141,7 +141,7 @@ public void beforeCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext) public void afterCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext) { try { if (isWriteAccess(iTokenCacheAccessContext)) { - cacheAccessor.write(iTokenCacheAccessContext.tokenCache().serialize().getBytes(StandardCharset.UTF_8)); + cacheAccessor.write(iTokenCacheAccessContext.tokenCache().serialize().getBytes(StandardCharsets.UTF_8)); updateLastSeenCacheFileModifiedTimestamp(); } } finally { diff --git a/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/persistence/linux/KeyRingAccessor.java b/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/persistence/linux/KeyRingAccessor.java index 439f10de..f19f9ac2 100644 --- a/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/persistence/linux/KeyRingAccessor.java +++ b/msal4j-persistence-extension/src/main/java/com/microsoft/aad/msal4jextensions/persistence/linux/KeyRingAccessor.java @@ -5,7 +5,6 @@ import com.microsoft.aad.msal4jextensions.persistence.CacheFileAccessor; import com.microsoft.aad.msal4jextensions.persistence.ICacheAccessor; -import com.nimbusds.jose.util.StandardCharset; import com.sun.jna.Pointer; import java.io.IOException; @@ -57,7 +56,7 @@ public void verify() { byte[] readData = read(testAttributeValue1, testAttributeValue2); - if (readData == null || !testData.equals(new String(readData, StandardCharset.UTF_8))) { + if (readData == null || !testData.equals(new String(readData, StandardCharsets.UTF_8))) { throw new KeyRingAccessException("An error while validating KeyRing availability"); }