Resolving changes from main branch

Author: tanya732

.github/workflows/build-and-test.yml

@@ -17,16 +17,16 @@ jobs:
           java-version: 17
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
 
       - name: Test and Assemble with Gradle
         run: ./gradlew assemble check --continue --console=plain
 
-      - uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+      - uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           flags: unittests
 
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7
         with:
           name: Reports
           path: |

.github/workflows/gradle-wrapper-validation.yml

@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: gradle/actions/wrapper-validation@v5.0.2
+      - uses: gradle/actions/wrapper-validation@v6.1.0

.github/workflows/rl-scanner.yml

@@ -41,7 +41,7 @@ jobs:
           java-version: ${{ inputs.java-version }}
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
 
       - name: Test and Assemble with Gradle
         run: ./gradlew assemble check --continue --console=plain

auth0-api-java/build.gradle

@@ -26,7 +26,7 @@ java {
 
 dependencies {
     // Core dependencies
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.21.2'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 
     // JWT validation dependencies
@@ -44,6 +44,12 @@ repositories {
     mavenCentral()
 }
 
+processResources {
+    filesMatching('auth0-client-info.properties') {
+        expand(version: project.version)
+    }
+}
+
 test {
     useJUnit()
     testLogging {

auth0-api-java/src/main/java/com/auth0/telemetry/TelemetryProvider.java

@@ -0,0 +1,64 @@
+package com.auth0.telemetry;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+/**
+ * Provides the Base64-encoded Auth0-Client telemetry header value.
+ *
+ * The payload is a JSON object: {"name":"springboot-api","version":"x.y.z","java":"17"}
+ */
+public final class TelemetryProvider {
+
+    private static final String PROPERTIES_FILE = "auth0-client-info.properties";
+    private static final String UNKNOWN = "unknown";
+
+    private static volatile String cachedHeaderValue;
+
+    private TelemetryProvider() {
+    }
+
+    /**
+     * Returns the Base64url-encoded telemetry header value.
+     *
+     * @return the Auth0-Client header value, or null if it cannot be built
+     */
+    public static String getHeaderValue() {
+        if (cachedHeaderValue != null) {
+            return cachedHeaderValue;
+        }
+        synchronized (TelemetryProvider.class) {
+            if (cachedHeaderValue != null) {
+                return cachedHeaderValue;
+            }
+            cachedHeaderValue = buildHeaderValue();
+            return cachedHeaderValue;
+        }
+    }
+
+    private static String buildHeaderValue() {
+        String name = UNKNOWN;
+        String version = UNKNOWN;
+
+        try (InputStream is = TelemetryProvider.class.getClassLoader()
+                .getResourceAsStream(PROPERTIES_FILE)) {
+            if (is != null) {
+                Properties props = new Properties();
+                props.load(is);
+                name = props.getProperty("name", UNKNOWN);
+                version = props.getProperty("version", UNKNOWN);
+            }
+        } catch (IOException ignored) {
+            // Fall through with defaults
+        }
+
+        String javaVersion = System.getProperty("java.version", UNKNOWN);
+
+        String json = "{\"name\":\"" + name + "\",\"version\":\"" + version + "\",\"java\":\"" + javaVersion + "\"}";
+
+        return java.util.Base64.getUrlEncoder().withoutPadding()
+                .encodeToString(json.getBytes(StandardCharsets.UTF_8));
+    }
+}

auth0-api-java/src/main/java/com/auth0/validators/JWTValidator.java

@@ -0,0 +1,2 @@
+version=${version}
+name=springboot-api

auth0-api-java/src/main/resources/auth0-client-info.properties

@@ -0,0 +1,39 @@
+package com.auth0.telemetry;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TelemetryProviderTest {
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void getHeaderValue_returnsValidBase64Json() throws Exception {
+        String headerValue = TelemetryProvider.getHeaderValue();
+        assertThat(headerValue).isNotNull().isNotEmpty();
+
+        byte[] decoded = Base64.getUrlDecoder().decode(headerValue);
+        String json = new String(decoded, StandardCharsets.UTF_8);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Map<String, String> payload = mapper.readValue(json, Map.class);
+
+        assertThat(payload).containsKey("name");
+        assertThat(payload).containsKey("version");
+        assertThat(payload).containsKey("java");
+        assertThat(payload.get("name")).isEqualTo("springboot-api");
+        assertThat(payload.get("java")).isEqualTo(System.getProperty("java.version"));
+    }
+
+    @Test
+    public void getHeaderValue_isCached() {
+        String first = TelemetryProvider.getHeaderValue();
+        String second = TelemetryProvider.getHeaderValue();
+        assertThat(first).isSameAs(second);
+    }
+}

auth0-api-java/src/test/java/com/auth0/telemetry/TelemetryProviderTest.java

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.3.0'
+    id 'org.springframework.boot' version '3.5.13'
     id 'io.spring.dependency-management' version '1.1.7'
 }
 

auth0-springboot-api-playground/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.springframework.boot' version '3.2.0'
+    id 'org.springframework.boot' version '3.5.13'
     id 'io.spring.dependency-management' version '1.1.7'
     id "com.diffplug.spotless" version "6.25.0"
 }