Finish HomeAssistant auth changes and implement no scroll for pages

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.3.0RC2</version>
+	<version>5.3.0RC3</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/plugins/hass/HassAuth.java

@@ -0,0 +1,13 @@
+package com.bwssystems.HABridge.plugins.hass;
+
+public class HassAuth {
+    boolean legacyauth;
+
+    public boolean isLegacyauth() {
+        return legacyauth;
+    }
+
+    public void setLegacyauth(boolean legacyauth) {
+        this.legacyauth = legacyauth;
+    }
+}

src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java

@@ -16,14 +16,19 @@ import com.bwssystems.HABridge.plugins.http.HTTPHome;
 import com.google.gson.Gson;
 
 public class HomeAssistant {
-    private static final Logger log = LoggerFactory.getLogger(HomeAssistant.class);
+	private static final Logger log = LoggerFactory.getLogger(HomeAssistant.class);
-    private NamedIP hassAddress;
+	private NamedIP hassAddress;
-    private HTTPHandler anHttpHandler;
+	private HTTPHandler anHttpHandler;
+	private HassAuth theAuthType;
+	private NameValue[] headers;
 
 	public HomeAssistant(NamedIP addressName) {
 		super();
 		anHttpHandler = HTTPHome.getHandler();
-        hassAddress = addressName;
+		hassAddress = addressName;
+		theAuthType = null;
+		headers = null;
+		isLegacyAuth();
 	}
 
 	public NamedIP getHassAddress() {
@@ -35,38 +40,30 @@ public class HomeAssistant {
 	}
 
 	public Boolean callCommand(HassCommand aCommand) {
-		log.debug("calling HomeAssistant: " + aCommand.getHassName() + " - "
+		log.debug("calling HomeAssistant: " + aCommand.getHassName() + " - " + aCommand.getEntityId() + " - "
-				+ aCommand.getEntityId() + " - " + aCommand.getState() + " - " + aCommand.getBri());
+				+ aCommand.getState() + " - " + aCommand.getBri());
 		String aUrl = null;
 		String domain = aCommand.getEntityId().substring(0, aCommand.getEntityId().indexOf("."));
 		aUrl = hassAddress.getHttpPreamble() + "/api/services/";
-		if(domain.equals("group"))
+		if (domain.equals("group"))
 			aUrl = aUrl + "homeassistant";
 		else
 			aUrl = aUrl + domain;
 		String aBody = "{\"entity_id\":\"" + aCommand.getEntityId() + "\"";
-		NameValue[] headers = null;
+		headers = getAuthHeader();
-		if(hassAddress.getPassword() != null && !hassAddress.getPassword().isEmpty()) {
+		if (aCommand.getState().equalsIgnoreCase("on")) {
-			NameValue password = new NameValue();
-			password.setName("x-ha-access");
-			password.setValue(hassAddress.getPassword());
-			headers = new NameValue[1];
-			headers[0] = password;
-		}
-		if(aCommand.getState().equalsIgnoreCase("on")) {
 			aUrl = aUrl + "/turn_on";
-			if(aCommand.getBri() != null)
+			if (aCommand.getBri() != null)
 				aBody = aBody + ",\"brightness\":" + aCommand.getBri() + "}";
 			else
 				aBody = aBody + "}";
-		}
+		} else {
-		else {
 			aUrl = aUrl + "/turn_off";
 			aBody = aBody + "}";
 		}
 		log.debug("Calling HomeAssistant with url: " + aUrl);
-   		String theData = anHttpHandler.doHttpRequest(aUrl, HttpPost.METHOD_NAME, "application/json", aBody, headers);
+		String theData = anHttpHandler.doHttpRequest(aUrl, HttpPost.METHOD_NAME, "application/json", aBody, headers);
-   		log.debug("call Command return is: <" + theData + ">");
+		log.debug("call Command return is: <" + theData + ">");
 		return true;
 	}
 
@@ -74,39 +71,62 @@ public class HomeAssistant {
 		List<State> theDeviceStates = null;
 		State[] theHassStates;
 		String theUrl = null;
-    	String theData;
+		String theData;
-		NameValue[] headers = null;
+		headers = getAuthHeader();
-		if(hassAddress.getPassword() != null && !hassAddress.getPassword().isEmpty()) {
+		if (hassAddress.getSecure() != null && hassAddress.getSecure())
-			NameValue password = new NameValue();
-			password.setName("x-ha-access");
-			password.setValue(hassAddress.getPassword());
-			headers = new NameValue[1];
-			headers[0] = password;
-		}
-		if(hassAddress.getSecure() != null && hassAddress.getSecure())
 			theUrl = "https";
 		else
 			theUrl = "http";
-   		theUrl = theUrl + "://" + hassAddress.getIp() + ":" + hassAddress.getPort() + "/api/states";
+		theUrl = theUrl + "://" + hassAddress.getIp() + ":" + hassAddress.getPort() + "/api/states";
-   		theData = anHttpHandler.doHttpRequest(theUrl, HttpGet.METHOD_NAME, "application/json", null, headers);
+		theData = anHttpHandler.doHttpRequest(theUrl, HttpGet.METHOD_NAME, "application/json", null, headers);
-    	if(theData != null) {
+		if (theData != null) {
-    		log.debug("GET Hass States - data: " + theData);
+			log.debug("GET Hass States - data: " + theData);
-    		theHassStates = new Gson().fromJson(theData, State[].class);
+			theHassStates = new Gson().fromJson(theData, State[].class);
-	    	if(theHassStates == null) {
+			if (theHassStates == null) {
-	    		log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName() + " as response is not parsable.");
+				log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName()
-	    	}
+						+ " as response is not parsable.");
-	    	else {
+			} else {
-	    		theDeviceStates = new ArrayList<State>(Arrays.asList(theHassStates));
+				theDeviceStates = new ArrayList<State>(Arrays.asList(theHassStates));
-	    	}
+			}
-    	}
+		} else
-    	else
+			log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName() + " http call failed.");
-    		log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName() + " http call failed.");
 		return theDeviceStates;
 	}
 
-	
 	protected void closeClient() {
 		anHttpHandler.closeHandler();
 		anHttpHandler = null;
 	}
+
+	private boolean isLegacyAuth() {
+		if (theAuthType == null) {
+			try {
+				theAuthType = new Gson().fromJson(hassAddress.getExtensions(), HassAuth.class);
+			} catch (Exception e) {
+				log.warn("Could not read hass auth - continuing with defaults.");
+				theAuthType = new HassAuth();
+				theAuthType.setLegacyauth(false);
+			}
+		}
+		return theAuthType.isLegacyauth();
+	}
+
+	private NameValue[] getAuthHeader() {
+		if (headers == null) {
+			if (hassAddress.getPassword() != null && !hassAddress.getPassword().isEmpty()) {
+				headers = new NameValue[1];
+				headers[0] = new NameValue();
+				if (isLegacyAuth()) {
+					headers[0].setName("x-ha-access");
+					headers[0].setValue(hassAddress.getPassword());
+				} else {
+					headers[0].setName("Authorization");
+					headers[0].setValue("Bearer " + hassAddress.getPassword());
+				}
+			}
+		} else if(hassAddress.getPassword() == null || hassAddress.getPassword().isEmpty()) {
+			headers = null;
+		}
+		return headers;
+	}
 }

src/main/resources/public/css/scrollable-table.css

@@ -29,7 +29,9 @@
 
 .scrollArea {
     height: 100%;
+/* THis makes the table scroll - disabled as a feature for now
     max-height: 800px;
+*/
     overflow-x: auto;
     overflow-y: auto;
     border: 1px solid #d5d5d5;

src/main/resources/public/scripts/app.js

@@ -1875,7 +1875,7 @@ app.controller('SystemController', function ($scope, $location, bridgeService, n
 			}
 		}
 	};
-	$scope.addHasstoSettings = function (newhassname, newhassip, newhassport, newhasspassword, newhasssecure) {
+	$scope.addHasstoSettings = function (newhassname, newhassip, newhassport, newhasspassword, newhasssecure, newhassauth) {
 		if ($scope.bridge.settings.hassaddress === undefined || $scope.bridge.settings.hassaddress === null) {
 			$scope.bridge.settings.hassaddress = {
 				devices: []
@@ -1886,7 +1886,8 @@ app.controller('SystemController', function ($scope, $location, bridgeService, n
 			ip: newhassip,
 			port: newhassport,
 			password: newhasspassword,
-			secure: newhasssecure
+			secure: newhasssecure,
+			extensions: newhassauth
 		};
 		$scope.bridge.settings.hassaddress.devices.push(newhass);
 		$scope.newhassname = null;