diff --git a/pom.xml b/pom.xml index 585350f7..fa3aa2c4 100644 --- a/pom.xml +++ b/pom.xml @@ -36,12 +36,8 @@ 8 4.12.0 2.10.1 - 1.9.0 UTF-8 - 4.12.0 4.13.2 - 2.3.1 - 1.3.5 ${project.version} @@ -55,30 +51,20 @@ com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.17.2 + 2.18.6 compile com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.17.2 + 2.18.6 compile io.github.cdimascio dotenv-java - 2.2.0 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - io.gsonfire - gson-fire - ${gson-fire-version} + 3.2.0 com.google.code.gson @@ -90,33 +76,12 @@ okhttp ${okhttp-version} - - com.squareup.okhttp3 - logging-interceptor - ${okhttp-version} - - - commons-codec - commons-codec - 1.15 - io.jsonwebtoken jjwt 0.12.6 - - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation-version} - provided - - - javax.xml.bind - jaxb-api - ${javax-xml-bind-version} - junit diff --git a/src/main/java/com/skyflow/serviceaccount/util/Token.java b/src/main/java/com/skyflow/serviceaccount/util/Token.java index 90da0cf4..85359cae 100644 --- a/src/main/java/com/skyflow/serviceaccount/util/Token.java +++ b/src/main/java/com/skyflow/serviceaccount/util/Token.java @@ -9,7 +9,7 @@ import com.skyflow.logs.ErrorLogs; import com.skyflow.logs.InfoLogs; import com.skyflow.utils.logger.LogUtil; -import org.apache.commons.codec.binary.Base64; +import java.util.Base64; import java.nio.charset.StandardCharsets; import java.util.Date; @@ -40,7 +40,7 @@ static JsonObject decoded(String encodedToken) throws JsonSyntaxException, Skyfl LogUtil.printErrorLog(ErrorLogs.INVALID_BEARER_TOKEN.getLog()); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtDecodeError.getMessage()); } - byte[] decodedBytes = Base64.decodeBase64(split[1]); + byte[] decodedBytes = Base64.getUrlDecoder().decode(split[1]); return JsonParser.parseString(new String(decodedBytes, StandardCharsets.UTF_8)).getAsJsonObject(); } } diff --git a/src/main/java/com/skyflow/utils/Utils.java b/src/main/java/com/skyflow/utils/Utils.java index ae5854cd..d116871f 100644 --- a/src/main/java/com/skyflow/utils/Utils.java +++ b/src/main/java/com/skyflow/utils/Utils.java @@ -12,7 +12,7 @@ import com.skyflow.serviceaccount.util.BearerToken; import com.skyflow.utils.logger.LogUtil; import com.skyflow.vault.connection.InvokeConnectionRequest; -import org.apache.commons.codec.binary.Base64; +import java.util.Base64; import java.io.File; import java.net.MalformedURLException; @@ -90,7 +90,7 @@ public static PrivateKey getPrivateKeyFromPem(String pemKey) throws SkyflowExcep privateKeyContent = privateKeyContent.replace(PKCS8PrivateFooter, ""); privateKeyContent = privateKeyContent.replace("\n", ""); privateKeyContent = privateKeyContent.replace("\r\n", ""); - privateKey = parsePkcs8PrivateKey(Base64.decodeBase64(privateKeyContent)); + privateKey = parsePkcs8PrivateKey(Base64.getDecoder().decode(privateKeyContent)); } else { LogUtil.printErrorLog(ErrorLogs.JWT_INVALID_FORMAT.getLog()); throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.JwtInvalidFormat.getMessage());