Merge pull request #16 from securenative/dev

Dev

Author: alexivsn

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.securenative.java</groupId>
     <artifactId>securenative-java</artifactId>
     <packaging>jar</packaging>
-    <version>0.3.4</version>
+    <version>0.3.5</version>
     <url>https://github.com/securenative/securenative-java</url>
 
     <name>${project.groupId}:${project.artifactId}:${project.version}</name>

src/main/java/com/securenative/http/SecureNativeHTTPClient.java

@@ -4,15 +4,18 @@
 import com.securenative.exceptions.SecureNativeInvalidUriException;
 import com.securenative.http.HttpClient;
 import com.securenative.http.HttpResponse;
+import com.securenative.utils.VersionUtils;
 import okhttp3.*;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 public class SecureNativeHTTPClient implements HttpClient {
-    private final String USER_AGENT_VALUE = "SecureNative-java";
-    private final String SN_VERSION = "SN-Version";
+    private final String AUTHORIZATION_HEADER = "Authorization";
+    private final String VERSION_HEADER = "SN-Version";
+    private final String USER_AGENT_HEADER = "User-Agent";
+    private final String USER_AGENT_HEADER_VALUE = "SecureNative-java";
     private final OkHttpClient client;
     private final SecureNativeOptions options;
     public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
@@ -26,7 +29,9 @@ public SecureNativeHTTPClient(SecureNativeOptions options) {
                 .addInterceptor((chain) ->{
                         Request request = chain.request();
                         Request authenticatedRequest = request.newBuilder()
-                                .header("Authorization", options.getApiKey()).build();
+                                .header(USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE)
+                                .header(VERSION_HEADER, VersionUtils.getVersion())
+                                .header(AUTHORIZATION_HEADER, options.getApiKey()).build();
                         return chain.proceed(authenticatedRequest);
                 }).build();
     }

src/main/java/com/securenative/utils/VersionUtils.java

@@ -0,0 +1,24 @@
+package com.securenative.utils;
+
+import com.securenative.ResourceStream;
+import com.securenative.ResourceStreamImpl;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
+public class VersionUtils {
+    private static ResourceStream resourceStream = new ResourceStreamImpl();
+
+    public static String getVersion() {
+        try {
+            MavenXpp3Reader reader = new MavenXpp3Reader();
+            String POM_RESOURCE = "/META-INF/maven/com.securenative.java/pom.xml";
+            Model read = reader.read(resourceStream.getInputStream(POM_RESOURCE));
+            return read.getParent().getVersion();
+        } catch (Exception e) {
+            return "unknown";
+        }
+    }
+}
+
+
+