Start adding new Bearer Token for Home Assistant

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

@@ -19,11 +19,14 @@ public class HomeAssistant {
 	private static final Logger log = LoggerFactory.getLogger(HomeAssistant.class);
 	private NamedIP hassAddress;
 	private HTTPHandler anHttpHandler;
+	private HassAuth theAuthType;
 
 	public HomeAssistant(NamedIP addressName) {
 		super();
 		anHttpHandler = HTTPHome.getHandler();
 		hassAddress = addressName;
+		theAuthType = null;
+		isLegacyAuth();
 	}
 
 	public NamedIP getHassAddress() {
@@ -35,8 +38,8 @@ public class HomeAssistant {
 	}
 
 	public Boolean callCommand(HassCommand aCommand) {
-		log.debug("calling HomeAssistant: " + aCommand.getHassName() + " - "
-				+ aCommand.getEntityId() + " - " + aCommand.getState() + " - " + aCommand.getBri());
+		log.debug("calling HomeAssistant: " + aCommand.getHassName() + " - " + aCommand.getEntityId() + " - "
+				+ aCommand.getState() + " - " + aCommand.getBri());
 		String aUrl = null;
 		String domain = aCommand.getEntityId().substring(0, aCommand.getEntityId().indexOf("."));
 		aUrl = hassAddress.getHttpPreamble() + "/api/services/";
@@ -59,8 +62,7 @@ public class HomeAssistant {
 				aBody = aBody + ",\"brightness\":" + aCommand.getBri() + "}";
 			else
 				aBody = aBody + "}";
-		}
-		else {
+		} else {
 			aUrl = aUrl + "/turn_off";
 			aBody = aBody + "}";
 		}
@@ -76,6 +78,7 @@ public class HomeAssistant {
 		String theUrl = null;
 		String theData;
 		NameValue[] headers = null;
+		// do check for what type of auth: bearer token or legacy password
 		if (hassAddress.getPassword() != null && !hassAddress.getPassword().isEmpty()) {
 			NameValue password = new NameValue();
 			password.setName("x-ha-access");
@@ -93,20 +96,31 @@ public class HomeAssistant {
 			log.debug("GET Hass States - data: " + theData);
 			theHassStates = new Gson().fromJson(theData, State[].class);
 			if (theHassStates == null) {
-	    		log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName() + " as response is not parsable.");
-	    	}
-	    	else {
+				log.warn("Cannot get an devices for HomeAssistant " + hassAddress.getName()
+						+ " as response is not parsable.");
+			} else {
 				theDeviceStates = new ArrayList<State>(Arrays.asList(theHassStates));
 			}
-    	}
-    	else
+		} else
 			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();
+	}
 }

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;

src/main/resources/public/views/system.html

@@ -411,7 +411,8 @@
 									<th>Name</th>
 									<th>IP</th>
 									<th>Port</th>
-									<th>Password (opt)</th>
+									<th>Token/Password</th>
+									<th>Auth Type</th>
 									<th>Use SSL</th>
 									<th>Manage</th>
 								</tr>
@@ -429,6 +430,12 @@
 								<td><input id="bridge-settings-next-hass-password"
 									class="form-control" type="password" ng-model="hass.password"
 									placeholder="Home Assistant password (opt)"></td>
+								<td>
+									<td>Legacy Password<input type="checkbox"
+										ng-model="hass.extensions.legacyauth" ng-true-value=true
+										ng-false-value=false>
+
+								</td>
 								<td><input type="checkbox"
 										ng-model="hass.secure" ng-true-value=true
 										ng-false-value=false></td>
@@ -448,11 +455,17 @@
 								<td><input id="bridge-settings-new-hass-password"
 									class="form-control" type="password" ng-model="newhasspassword"
 									placeholder="Home Assistant password (opt)"></td>
+									<td>
+										<td>Legacy Password<input type="checkbox"
+											ng-model="newhassauth.legacyauth" ng-true-value=true
+											ng-false-value=false>
+	
+									</td>
 									<td><input type="checkbox"
 										ng-model="newhasssecure" ng-true-value=true
 										ng-false-value=false></td>
 								<td><button class="btn btn-success" type="submit"
-										ng-click="addHasstoSettings(newhassname, newhassip, newhassport, newhasspassword, newhasssecure)">Add</button></td>
+										ng-click="addHasstoSettings(newhassname, newhassip, newhassport, newhasspassword, newhasssecure, newhassauth)">Add</button></td>
 							</tr>
 						</table></td>
 				</tr>