WebUi PW Support (#9)

* Initial WebUi Password Support

* Small changes

* Initial WebUi Password Support

* Small changes

* Basic WebUi Token support

* added "removeStorage", added uiLock, updated login page

* Small improvments

* Small change

assets/webconfig/js/content_index.js

@@ -80,15 +80,77 @@ $(document).ready( function() {
     });
 
 	$(window.hyperion).one("cmd-authorize-login", function(event) {
+		$("#main-nav").removeAttr('style')
+		$("#top-navbar").removeAttr('style')
+			
+		if(window.defaultPasswordIsSet === true)
+			$('#hyperion_default_password_notify').fadeIn().delay(10000).fadeOut();
+		else
+			//if logged on and pw != default show option to lock ui
+			$("#btn_lock_ui").removeAttr('style')
+
+					
+		if (event.response.hasOwnProperty('info'))
+			setStorage("loginToken", event.response.info.token, true);
+
 		requestServerConfigSchema();
 	});
 
+	$(window.hyperion).on("cmd-authorize-newPassword", function(event) {
+        if (event.response.success === true) 
+			showInfoDialog("success",$.i18n('InfoDialog_changePassword_success'));
+    });
+
+	$(window.hyperion).one("cmd-authorize-newPasswordRequired", function(event) {
+		var loginToken = getStorage("loginToken", true)
+
+		if (event.response.info.newPasswordRequired == true)
+		{
+			window.defaultPasswordIsSet = true;
+			
+			if(loginToken)
+				requestTokenAuthorization(loginToken)
+			else
+				requestAuthorization('hyperion');
+		}
+		else
+		{
+			$("#main-nav").attr('style', 'display:none')
+			$("#top-navbar").attr('style', 'display:none')
+
+			if(loginToken)
+				requestTokenAuthorization(loginToken)
+			else
+				loadContentTo("#page-content", "login")	
+			
+		}
+	});
+
+	$(window.hyperion).one("cmd-authorize-adminRequired", function(event) {
+		//Check if a admin login is required. 
+		//If yes: check if default pw is set. If no: go ahead to get server config and render page
+		if (event.response.info.adminRequired === true) 
+			requestRequiresDefaultPasswortChange();
+		else
+			requestServerConfigSchema();
+	});
+
 	$(window.hyperion).on("error",function(event){
-		showInfoDialog("error","Error", event.reason);
+		//If we are getting an error "No Authorization" back with a set loginToken we will forward to new Login (Token is expired. 
+		//e.g.: hyperiond was started new in the meantime)
+		if (event.reason == "No Authorization" && getStorage("loginToken", true))
+		{
+			removeStorage("loginToken", true);
+			requestRequiresAdminAuth();
+		}
+		else
+		{
+			showInfoDialog("error","Error", event.reason);
+		}
 	});
 
 	$(window.hyperion).on("open",function(event){
-		requestAuthorization();
+		requestRequiresAdminAuth();
 	});
 
 	$(window.hyperion).one("ready", function(event) {

assets/webconfig/js/hyperion.js

@@ -28,6 +28,7 @@ window.wSess = [];
 window.currentHyperionInstance = 0;
 window.currentHyperionInstanceName = "?";
 window.comps = [];
+window.defaultPasswordIsSet = null;
 tokenList = {};
 
 function initRestart()
@@ -176,14 +177,19 @@ function requestRequiresDefaultPasswortChange()
 	sendToHyperion("authorize","newPasswordRequired");
 }
 // Change password
-function requestChangePassword(oldPw, newPW)
+function requestChangePassword(oldPw, newPw)
 {
 	sendToHyperion("authorize","newPassword",'"password": "'+oldPw+'", "newPassword":"'+newPw+'"');
 }
 
-function requestAuthorization()
+function requestAuthorization(password)
 {
-	sendToHyperion("authorize","login",'"password": "hyperion"');
+	sendToHyperion("authorize","login",'"password": "' + password + '"');
+}
+
+function requestTokenAuthorization(token)
+{
+	sendToHyperion("authorize","login",'"token": "' + token + '"');
 }
 
 function requestToken(comment)

assets/webconfig/js/settings.js

@@ -112,6 +112,24 @@ $(document).ready( function() {
 		$('#id_select').trigger('change');
 	});
 
+	//Change Password
+	$('#btn_changePassword').off().on('click',function() {
+		showInfoDialog('changePassword', $.i18n('InfoDialog_changePassword_title'));		
+
+		$('#id_btn_ok').off().on('click',function() {
+			var oldPw = $('#oldPw').val();
+			var newPw = $('#newPw').val();
+		
+			requestChangePassword(oldPw, newPw)
+		});
+	});
+
+	//Lock Ui
+	$('#btn_lock_ui').off().on('click',function() {
+		removeStorage('loginToken', true);
+		location.replace('/');
+	});
+
 	//hide menu elements
 	if (storedAccess != 'expert')
 		$('#load_webconfig').toggle(false);

assets/webconfig/js/ui_utils.js

@@ -40,6 +40,17 @@ function setStorage(item, value, session)
 	}
 }
 
+function removeStorage(item, session)
+{
+	if(storageComp())
+	{
+		if(session === true)
+			sessionStorage.removeItem(item);
+		else
+			localStorage.removeItem(item);
+	}
+}
+
 function debugMessage(msg)
 {
 	if (window.debugMessagesActive)
@@ -286,6 +297,15 @@ function showInfoDialog(type,header,message)
 		$('#id_footer_rename').html('<button type="button" id="id_btn_ok" class="btn btn-success" data-dismiss-modal="#modal_dialog_rename" disabled><i class="fa fa-fw fa-save"></i>'+$.i18n('general_btn_ok')+'</button>');
 		$('#id_footer_rename').append('<button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'+$.i18n('general_btn_cancel')+'</button>');
 	}
+	else if (type == "changePassword")
+	{
+		$('#id_body_rename').html('<i style="margin-bottom:20px" class="fa fa-key modal-icon-edit"><br>');
+		$('#id_body_rename').append('<h4>'+header+'</h4>');
+		$('#id_body_rename').append('<input class="form-control" id="oldPw" placeholder="Old" type="text"> <br />');
+		$('#id_body_rename').append('<input class="form-control" id="newPw" placeholder="New" type="text">');
+		$('#id_footer_rename').html('<button type="button" id="id_btn_ok" class="btn btn-success" data-dismiss-modal="#modal_dialog_rename"><i class="fa fa-fw fa-save"></i>'+$.i18n('general_btn_ok')+'</button>');
+		$('#id_footer_rename').append('<button type="button" class="btn btn-danger" data-dismiss="modal"><i class="fa fa-fw fa-close"></i>'+$.i18n('general_btn_cancel')+'</button>');
+	}
 	else if (type == "checklist")
 	{
 		$('#id_body').html('<img style="margin-bottom:20px" src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
@@ -315,7 +335,7 @@ function showInfoDialog(type,header,message)
 		$('#id_body').append('<select id="id_select" class="form-control" style="margin-top:10px;width:auto;"></select>');
 
 
-	$(type == "renInst" ? "#modal_dialog_rename" : "#modal_dialog").modal({
+	$(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({
 		backdrop : "static",
 		keyboard: false,
 		show: true