Merge pull request #23 from iot-dsa-v2/develop

1.1.7

Author: d-shapiro

build.gradle

@@ -24,7 +24,7 @@ repositories {
 
 dependencies {
     //implementation 'org.iot-dsa:dslink-v2-websocket:+' //for a locally installed sdk
-    implementation 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:+'
+    implementation 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:0.62.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.1.6",
+  "version": "1.1.7",
   "description": "Java DSA to REST adpater DSLink",
   "main": "bin/dslink-java-v2-restadapter",
   "configs": {

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

@@ -137,7 +137,7 @@ public void responseRecieved(ResponseWrapper resp, int rowNum) {
         if (resp == null) {
             put(lastRespCode, DSInt.valueOf(-1));
             put(lastRespData, DSString.valueOf("Failed to send update"));
-            put(lastRespTs, DSString.valueOf(DSDateTime.currentTime()));
+            put(lastRespTs, DSString.valueOf(DSDateTime.now()));
         } else {
             int status = resp.getCode();
             String data = resp.getData();

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

@@ -33,7 +33,7 @@ public void responseRecieved(ResponseWrapper resp, int rowNum) {
         if (resp == null) {
             respMap.put(Constants.LAST_RESPONSE_CODE, -1);
             respMap.put(Constants.LAST_RESPONSE_DATA, "Failed to send update");
-            respMap.put(Constants.LAST_RESPONSE_TS, DSDateTime.currentTime().toString());
+            respMap.put(Constants.LAST_RESPONSE_TS, DSDateTime.now().toString());
         } else {
             int status = resp.getCode();
             String data = resp.getData();

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

@@ -1,15 +1,19 @@
 package org.iot.dsa.dslink.restadapter;
 
 
+import java.io.IOException;
 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.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import okhttp3.Route;
 
 public class WebClientProxy extends DSLogger {
     private CredentialProvider credentials;
@@ -70,14 +74,31 @@ private void prepareClient() {
             client  = configureAuthorization();
         }
     }
+    
+    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:
-                //TODO implement basic auth
+                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();
+                    }
+                });
                 break;
             case OAUTH2_CLIENT:
             case OAUTH2_USR_PASS: