mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 16:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated security to have basic auth and also remove login when reinit

Browse Source 
happens.
This commit is contained in:
Admin
2017-04-03 16:40:46 -05:00
parent 2f1adf9d4b
commit a7e516925c
8 changed files with 93 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/resources/public/scripts/app.js
View File

@@ -87,6 +87,7 @@ app.run( async function ($rootScope, $location, Auth, bridgeService) {
bridgeService.getTestUser();
bridgeService.getSecurityInfo();
bridgeService.viewMapTypes();
bridgeService.viewConfigs();
$location.path("/");
} else {
event.preventDefault();
@@ -94,12 +95,33 @@ app.run( async function ($rootScope, $location, Auth, bridgeService) {
}
});
$rootScope.$on('securityReview', function(event, data) {
if(Auth.isLoggedIn()) {
bridgeService.loadBridgeSettings();
bridgeService.getTestUser();
bridgeService.getSecurityInfo();
bridgeService.viewMapTypes();
bridgeService.viewConfigs();
$location.path("/");
} else {
event.preventDefault();
$location.path("/login");
}
});
$rootScope.$on('securityReinit', function(event, data) {
event.preventDefault();
Auth.logout();
$location.path("/login");
});
$rootScope.$on('$routeChangeStart', function (event, next) {
if(Auth.isLoggedIn()) {
bridgeService.loadBridgeSettings();
bridgeService.getTestUser();
bridgeService.getSecurityInfo();
bridgeService.viewMapTypes();
bridgeService.viewConfigs();
}
if (!Auth.checkPermissionForView(next)){
event.preventDefault();
@@ -870,10 +892,9 @@ app.service ('bridgeService', function ($rootScope, $http, $base64, $location, n
return $http.get(this.state.bridgelocation + "/description.xml").then(
function (response) {
ngToast.dismiss(self.state.myToastMsg);
self.viewConfigs();
self.state.myToastMsg = null;
self.state.isInControl = false;
window.location.reload();
$rootScope.$broadcast('securityReinit', 'done');
},
function (error) {
setTimeout(function(){
@@ -3213,6 +3234,7 @@ app.filter('configuredSomfyDevices', function (bridgeService) {
app.controller('LoginController', function ($scope, $location, Auth) {
$scope.failed = false;
$scope.loggedIn = Auth.isLoggedIn();
$scope.login = function(username, password) {
Auth.login(username, password)
.then(function() {
@@ -3224,6 +3246,8 @@ app.controller('LoginController', function ($scope, $location, Auth) {
$scope.logout = function() {
Auth.logout();
$scope.loggedIn = Auth.isLoggedIn();
$location.path("/login");
};
});