Removed duplicate UserAgent logic

used okta-commons-lang ApplicationInfo instead

oauth2/pom.xml

@@ -38,6 +38,10 @@
             <groupId>com.okta.commons</groupId>
             <artifactId>okta-config-check</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.okta.commons</groupId>
+            <artifactId>okta-commons-lang</artifactId>
+        </dependency>
 
         <!-- security -->
         <dependency>

oauth2/src/main/java/com/okta/spring/boot/oauth/http/UserAgentRequestInterceptor.java

@@ -15,19 +15,25 @@
  */
 package com.okta.spring.boot.oauth.http;
 
+import com.okta.commons.lang.ApplicationInfo;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 public final class UserAgentRequestInterceptor implements ClientHttpRequestInterceptor {
 
+    private final static String USER_AGENT_VALUE = ApplicationInfo.get().entrySet().stream()
+            .map(e -> e.getKey() + "/" + e.getValue())
+            .collect(Collectors.joining(" "));
+
     @Override
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-        request.getHeaders().add(HttpHeaders.USER_AGENT, UserAgent.getUserAgentString());
+        request.getHeaders().add(HttpHeaders.USER_AGENT, USER_AGENT_VALUE);
         return execution.execute(request, body);
     }
 }

oauth2/src/test/groovy/com/okta/spring/boot/oauth/http/UserAgentRequestInterceptorTest.groovy

@@ -15,14 +15,19 @@
  */
 package com.okta.spring.boot.oauth.http
 
-import org.hamcrest.MatcherAssert
+import org.mockito.ArgumentCaptor
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpRequest
 import org.springframework.http.client.ClientHttpRequestExecution
 import org.springframework.http.client.ClientHttpResponse
 import org.testng.annotations.Test
 
+import static org.hamcrest.Matchers.allOf
+import static org.hamcrest.Matchers.containsString
 import static org.hamcrest.Matchers.is
+import static org.hamcrest.Matchers.matchesPattern
+import static org.hamcrest.Matchers.not
+import static org.mockito.ArgumentMatchers.eq
 import static org.mockito.Mockito.mock
 import static org.mockito.Mockito.verify
 import static org.mockito.Mockito.when
@@ -44,6 +49,17 @@ class UserAgentRequestInterceptorTest {
         def underTest = new UserAgentRequestInterceptor()
         assertThat underTest.intercept(request, null, execution), is(response)
 
-        verify(headers).add("User-Agent", UserAgent.userAgentString)
+        def userAgentCapture = ArgumentCaptor.forClass(String)
+
+        verify(headers).add(eq("User-Agent"), userAgentCapture.capture())
+        def userAgentString = userAgentCapture.getValue()
+        assertThat userAgentString, allOf(
+                    matchesPattern(".*okta-spring-security/\\d.*"),
+                    matchesPattern(".* spring/\\d.*"),
+                    matchesPattern(".* spring-boot/\\d.*"),
+                    containsString("java/${System.getProperty("java.version")}"),
+                    containsString("${System.getProperty("os.name")}/${System.getProperty("os.version")}"),
+                    not(containsString('${'))
+        )
     }
 }

pom.xml

@@ -35,6 +35,7 @@
         <spring-cloud.version>2.0.2.RELEASE</spring-cloud.version>
         <github.slug>okta/okta-spring-boot</github.slug>
         <okta.sdk.version>1.3.0</okta.sdk.version>
+        <okta.commons.version>1.1.0</okta.commons.version>
     </properties>
 
     <modules>
@@ -106,7 +107,12 @@
             <dependency>
                 <groupId>com.okta.commons</groupId>
                 <artifactId>okta-config-check</artifactId>
-                <version>1.0.0</version>
+                <version>${okta.commons.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.okta.commons</groupId>
+                <artifactId>okta-commons-lang</artifactId>
+                <version>${okta.commons.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.okta.oidc.tck</groupId>