From 75b925992bd3f05d72df33faf26b96f637fc3f7a Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Fri, 17 Nov 2017 15:56:23 -0600
Subject: [PATCH] Updated favicon, enhanced login/logout.

---
 pom.xml                                    |   2 +-
 src/main/resources/public/img/favicon.ico  | Bin 0 -> 2600 bytes
 src/main/resources/public/index.html       |   1 +
 src/main/resources/public/scripts/app.js   |  16 +++++++++++-----
 src/main/resources/public/views/login.html |   7 +++++--
 5 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/public/img/favicon.ico

diff --git a/pom.xml b/pom.xml
index 0ede241..bb751a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.0.0rc6</version>
+	<version>5.0.0rc7</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/img/favicon.ico b/src/main/resources/public/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5c72a351731147dd6863d43b01fb76433f7677b2
GIT binary patch
literal 2600
zcmWlb2{_c-8^^~ILzW@r`j;iHEf-0)NS3h^lW}KaEMu%??0d-A!nJRqF{#GHge;ML
ziei%O&ehP^DngPi*~0(y{GRhW&vTyl_dDl(-|zc*PrALGIX|xiF9ZVNx3n-tfLZ$Y
zfO3I%XiUrxFmYk6%}pW4zn=$Plmf8A6J&u7g+K)Qeh;>y^8)_^i`-$Bws7uQJ^@it
z*_5ZgMZoO2rKyo4s+U+Y7<k4@>~(@0GCch6=N<bCeQ(t5Sn{4*^4U-V)WZED_JqYV
zNS>kl=r{M?J9oJnHhFpE-1|LW4qxTd@O?EWo*JC*kP0WPM(H(pMz#{`;$M))w|Bks
z!g$25zWcArX*-Vc-C(gIG^H?qb`vV|lf9>$NHlP!jz4jtMpc*}AD~ps<O@Dd`j8CR
zpIRtc_bgAjaY!fIC+6+#?PVdVlj~Mc#VLMePiit?1Zn8fc8q4Z?LO^Btyr5&wr79#
zq2z$I(&6zRcVO5c508&u-@g~zh`OJbCzMZ@OZ9kAql~b6T)5kvvly+DZPLo}ii|8-
zT@6rm>$Yi{#QFPY_*6uHF;nvTsLcj5R-{d&pHg^Fkaox6k_}>ix{Gs-`HEney@oq+
zQp|83!koGEe$m9#6wcE#38z8d8Zk_O?S7|>?+QU=k~J=0KJZamaQn2O1CC}RpX4Df
zo|?GQE|LjvX>F}`RF;7vk$;Gb(;8I})glNh<svIoR_1B7PtlU~-TPlnXtU(P88tR>
z5|MZqsZolX?T*7Wp}DxY?2$z$Ppdv_Ztfc%7BGhDkC-qtMc_tIBRS!hJ8{D4oCiB=
zKEA$pBRXu!h)PH0hQ>z1XPtNN-c6k+>mRy7l3_`t+ne-pl**gFKF*}1BvdiHp6Q9l
zXJ7OghGm&ec0>kF2-`A7HTjh|yYMA3U3RrjkEZbjL*8wxEiA~hfO6wXTFS}O>U>E|
z*Vw-l$S#6xP?`TyQcl!6Q7`D~(%0A3>9~CFCORvyXXwovu2ZK@@$vIluIS}i%uDdF
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html
index 76eff64..6d23c7e 100644
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>HA Bridge</title>
+    <link rel="shortcut icon" href="img/favicon.ico?v=2">
     <link href="css/main.css" rel="stylesheet">
     <link href="css/bootstrap.min.css" rel="stylesheet">
     <link href="css/bootstrap-theme.min.css" rel="stylesheet">
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index cdfe1fb..0b8ae5d 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -109,9 +109,9 @@ app.run(function ($rootScope, $location, Auth, bridgeService) {
     
     $rootScope.$on('securityReinit', function(event, data) {
         event.preventDefault();
-    	Auth.logout();
     	bridgeService.state.testuser = "";
-        $location.path("/login");        	
+    	Auth.logout();
+		$location.path("/");
     });
     
     $rootScope.$on('$routeChangeStart', function (event, next) {
@@ -1637,7 +1637,8 @@ app.controller('SecurityDialogCtrl', function ($scope, bridgeService, ngDialog)
 		if(bridgeService.state.loggedInUser !== undefined)
 			$scope.username = bridgeService.state.loggedInUser;
 		else
-			$scope.username = ""
+			$scope.username = "";
+		bridgeService.getHABridgeVersion();
 		$scope.showPassword = $scope.isSecure;
 	};
 	
@@ -3745,8 +3746,9 @@ app.filter('filterDevicesByRequester', function () {
 	}
 });
 
-app.controller('LoginController', function ($scope, $location, Auth) {
+app.controller('LoginController', function ($scope, $location, Auth, bridgeService) {
     $scope.failed = false;
+    $scope.isSecure = bridgeService.isSecure();
     $scope.loggedIn = Auth.isLoggedIn();
 	$scope.login = function(username, password) {
         Auth.login(username, password)
@@ -3759,8 +3761,12 @@ app.controller('LoginController', function ($scope, $location, Auth) {
 
 	$scope.logout = function() {
         Auth.logout();
+        $scope.isSecure = bridgeService.isSecure();
         $scope.loggedIn = Auth.isLoggedIn();
-        $location.path("/login");
+        if($scope.isSecure)
+        	$location.path("/login");
+        else
+        	$location.path("/");
 	};
 });
 
diff --git a/src/main/resources/public/views/login.html b/src/main/resources/public/views/login.html
index 3019997..295eaf9 100644
--- a/src/main/resources/public/views/login.html
+++ b/src/main/resources/public/views/login.html
@@ -3,7 +3,7 @@
 		<h2 class="panel-title">Login</h2>
 	</div>
 	<div class="panel-body">
-		<div ng-if="!loggedIn" class="form-container">
+		<div ng-if="!loggedIn && isSecure" class="form-container">
 
 			<form name="loginForm" role="form" ng-submit="login(username, password)">
 				<legend class="form-label">Enter Credentials</legend>
@@ -25,8 +25,11 @@
 			</div>
 
 		</div>
-		<div ng-if="loggedIn">
+		<div ng-if="loggedIn && isSecure">
 			<button type="button" class="btn btn-danger" ng-click="logout()">Are you sure you want to Logout?</button>
 		</div>
+		<div ng-if="!isSecure">
+			<p>This ha-bridge instance is not secured!</p>
+		</div>
 	</div>
 </div>
\ No newline at end of file