1.2.1

Do basic auth more efficiently (Include the auth header preemptively)
Add cookie jar
Allow requests made by WebClientProxy to be modified before they are sent

Author: d-shapiro

build.gradle

@@ -26,6 +26,7 @@ dependencies {
     //implementation 'org.iot-dsa:dslink-v2-websocket:+' //for a locally installed sdk
     api 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:+'
     api 'com.squareup.okhttp3:okhttp:3.14.0'
+    api 'com.squareup.okhttp3:okhttp-urlconnection:3.8.1'
     implementation 'commons-logging:commons-logging:+'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
     implementation 'commons-io:commons-io:2.6'

dslink.json

@@ -1,6 +1,6 @@
 {
   "name": "dslink-java-v2-restadapter",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Java DSA to REST adapter DSLink",
   "main": "bin/dslink-java-v2-restadapter",
   "configs": {

src/main/java/org/iot/dsa/dslink/restadapter/BasicAuthInterceptor.java

@@ -0,0 +1,25 @@
+package org.iot.dsa.dslink.restadapter;
+
+import java.io.IOException;
+import okhttp3.Credentials;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class BasicAuthInterceptor implements Interceptor {
+    
+    private String credentials;
+
+    public BasicAuthInterceptor(String user, String password) {
+        this.credentials = Credentials.basic(user, password);
+    }
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        Request authenticatedRequest = request.newBuilder()
+                    .header("Authorization", credentials).build();
+        return chain.proceed(authenticatedRequest);
+    }
+
+}

src/main/java/org/iot/dsa/dslink/restadapter/WebClientProxy.java

@@ -1,20 +1,19 @@
 package org.iot.dsa.dslink.restadapter;
 
 
-import java.io.IOException;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
 import java.time.Duration;
 import org.iot.dsa.logging.DSLogger;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSMap.Entry;
-import okhttp3.Authenticator;
-import okhttp3.Credentials;
 import okhttp3.HttpUrl;
+import okhttp3.JavaNetCookieJar;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.Route;
 
 public class WebClientProxy extends DSLogger {
     private CredentialProvider credentials;
@@ -49,11 +48,14 @@ public WebClientProxy(CredentialProvider credentials, long readTimeoutMillis, lo
 //        return new WebClientProxy(username, password, clientID, clientSecret, tokenURL, Util.AUTH_SCHEME.OAUTH2_USR_PASS);
 //    }
 
-
-    public Response invoke(String httpMethod, String address, DSMap urlParameters, Object body) {
+    public Request.Builder prepareInvoke(String httpMethod, String address, DSMap urlParameters, Object body) {
         prepareClient();
         Request.Builder requestBuilder = prepareRequest(address, urlParameters);
         requestBuilder.method(httpMethod, body == null ? null : RequestBody.create(MediaType.parse("application/json"), body.toString()));
+        return requestBuilder;
+    }
+    
+    public Response completeInvoke(Request.Builder requestBuilder) {
         Request request = requestBuilder.build();
         Response response = null;
         try {
@@ -64,6 +66,12 @@ public Response invoke(String httpMethod, String address, DSMap urlParameters, O
         return response;
     }
 
+
+    public Response invoke(String httpMethod, String address, DSMap urlParameters, Object body) {
+        Request.Builder requestBuilder = prepareInvoke(httpMethod, address, urlParameters, body);
+        return completeInvoke(requestBuilder);
+    }
+    
     private Request.Builder prepareRequest(String address, DSMap urlParameters) {
         HttpUrl.Builder urlBuilder = HttpUrl.parse(address).newBuilder();
 
@@ -84,30 +92,31 @@ private void prepareClient() {
         }
     }
 
-    private static int responseCount(Response response) {
-        int result = 1;
-        while ((response = response.priorResponse()) != null) {
-            result++;
-        }
-        return result;
-    }
+//    private static int responseCount(Response response) {
+//        int result = 1;
+//        while ((response = response.priorResponse()) != null) {
+//            result++;
+//        }
+//        return result;
+//    }
 
     private OkHttpClient configureAuthorization() {
         OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
         switch (getScheme()) {
             case NO_AUTH:
                 break;
             case BASIC_USR_PASS:
-                clientBuilder.authenticator(new Authenticator() {
-                    @Override
-                    public Request authenticate(Route route, Response response) throws IOException {
-                        if (responseCount(response) >= 3) {
-                            return null;
-                        }
-                        String credential = Credentials.basic(credentials.getUsername(), credentials.getPassword());
-                        return response.request().newBuilder().header("Authorization", credential).build();
-                    }
-                });
+//                clientBuilder.authenticator(new Authenticator() {
+//                    @Override
+//                    public Request authenticate(Route route, Response response) throws IOException {
+//                        if (responseCount(response) >= 3) {
+//                            return null;
+//                        }
+//                        String credential = Credentials.basic(credentials.getUsername(), credentials.getPassword());
+//                        return response.request().newBuilder().header("Authorization", credential).build();
+//                    }
+//                });
+                clientBuilder.addInterceptor(new BasicAuthInterceptor(credentials.getUsername(), credentials.getPassword()));
                 break;
             case OAUTH2_CLIENT:
             case OAUTH2_USR_PASS:
@@ -121,6 +130,9 @@ public Request authenticate(Route route, Response response) throws IOException {
         if (writeTimeout != null) {
             clientBuilder.writeTimeout(writeTimeout);
         }
+        CookieManager cookieManager = new CookieManager();
+        cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+        clientBuilder.cookieJar(new JavaNetCookieJar(cookieManager));
         return clientBuilder.build();
     }