Feat: Add Admin API (#617)

* Push progress

TODO: rework RESET, probably to main.cpp again

* resetPassword rework

* enable administration restriction

* add short cmd for userdata

* Js apis

* Refactor JsonCB class

* Add userToken Auth

* Feat: Close connection if ext clients when def pw is set

* Feat: Protect db against pw/token tests

* 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

* Fix: prevent downgrade of authorization

* Add translation for localAdminAuth

* Feat: Show always save button in led layout

* Revert "Feat: Show always save button in led layout"

This reverts commit caad1dfcde.

* Feat: Password change link in notification

* Fix: body padding modal overlap

* Feat: Add instance index to response on switch

* prevent schema error

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>

* Feat: add pw save

* Feat: callout settings/pw replaced with notification

assets/webconfig/js/content_index.js

@@ -72,23 +72,88 @@ $(document).ready( function() {
 
 		window.showOptHelp = window.serverConfig.general.showOptHelp;
 	});
-	
+
 	$(window.hyperion).on("cmd-config-setconfig", function(event) {
         if (event.response.success === true) {
-            $('#hyperion_config_write_success_notify').fadeIn().delay(5000).fadeOut();
+			showNotification('success', $.i18n('dashboard_alert_message_confsave_success'), $.i18n('dashboard_alert_message_confsave_success_t'))
         }
     });
 
 	$(window.hyperion).one("cmd-authorize-login", function(event) {
+		$("#main-nav").removeAttr('style')
+		$("#top-navbar").removeAttr('style')
+
+		if(window.defaultPasswordIsSet === true)
+			showNotification('warning',  $.i18n('dashboard_message_default_password'),  $.i18n('dashboard_message_default_password_t'), '<a style="cursor:pointer" onClick="changePassword()"> '+$.i18n('InfoDialog_changePassword_title')+'</a>')
+		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'));
+			// not necessarily true, but better than nothing
+			window.defaultPasswordIsSet = false;
+		}
+    });
+
+	$(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) {
@@ -190,3 +255,8 @@ $(function(){
 		$(this).toggleClass('active inactive');
 	});
 });
+
+// hotfix body padding when bs modals overlap
+$(document.body).on('hide.bs.modal,hidden.bs.modal', function () {
+    $('body').css('padding-right','0');
+});

assets/webconfig/js/hyperion.js

@@ -28,6 +28,7 @@ window.wSess = [];
 window.currentHyperionInstance = 0;
 window.currentHyperionInstanceName = "?";
 window.comps = [];
+window.defaultPasswordIsSet = null;
 tokenList = {};
 
 function initRestart()
@@ -165,9 +166,30 @@ function sendToHyperion(command, subcommand, msg)
 // -----------------------------------------------------------
 // wrapped server commands
 
-function requestAuthorization()
+// Test if admin requires authentication
+function requestRequiresAdminAuth()
 {
-	sendToHyperion("authorize","login",'"username": "Hyperion", "password": "hyperion"');
+	sendToHyperion("authorize","adminRequired");
+}
+// Test if the default password needs to be changed
+function requestRequiresDefaultPasswortChange()
+{
+	sendToHyperion("authorize","newPasswordRequired");
+}
+// Change password
+function requestChangePassword(oldPw, newPw)
+{
+	sendToHyperion("authorize","newPassword",'"password": "'+oldPw+'", "newPassword":"'+newPw+'"');
+}
+
+function requestAuthorization(password)
+{
+	sendToHyperion("authorize","login",'"password": "' + password + '"');
+}
+
+function requestTokenAuthorization(token)
+{
+	sendToHyperion("authorize","login",'"token": "' + token + '"');
 }
 
 function requestToken(comment)

assets/webconfig/js/settings.js

@@ -4,6 +4,26 @@ var availLang = ['en','de','es','it','cs'];
 var availAccess = ['default','advanced','expert'];
 //$.i18n.debug = true;
 
+//Change Password
+function changePassword(){
+	showInfoDialog('changePassword', $.i18n('InfoDialog_changePassword_title'));
+
+	// fill default pw if default is set
+	if(window.defaultPasswordIsSet)
+		$('#oldPw').val('hyperion')
+
+	$('#id_btn_ok').off().on('click',function() {
+		var oldPw = $('#oldPw').val();
+		var newPw = $('#newPw').val();
+
+		requestChangePassword(oldPw, newPw)
+	});
+
+	$('#newPw, #oldPw').off().on('input',function(e) {
+		($('#oldPw').val().length >= 8 && $('#newPw').val().length >= 8) ? $('#id_btn_ok').attr('disabled', false) : $('#id_btn_ok').attr('disabled', true);
+	});
+}
+
 $(document).ready( function() {
 
 	//i18n
@@ -112,6 +132,17 @@ $(document).ready( function() {
 		$('#id_select').trigger('change');
 	});
 
+	// change pw btn
+	$('#btn_changePassword').off().on('click',function() {
+		changePassword();
+	});
+
+	//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

@@ -297,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" 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 == "checklist")
 	{
 		$('#id_body').html('<img style="margin-bottom:20px" src="img/hyperion/hyperionlogo.png" alt="Redefine ambient light!">');
@@ -326,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
@@ -534,8 +543,9 @@ function hexToRgb(hex) {
 	@param type     Valid types are "info","success","warning","danger"
 	@param message  The message to show
 	@param title     A title (optional)
+	@param addhtml   Add custom html to the notification end
  */
-function showNotification(type, message, title="")
+function showNotification(type, message, title="", addhtml="")
 {
 	if(title == "")
 	{
@@ -564,15 +574,19 @@ function showNotification(type, message, title="")
 		// settings
 		type: type,
 		animate: {
-			enter: 'animated fadeInRight',
-			exit: 'animated fadeOutRight'
+			enter: 'animated fadeInDown',
+			exit: 'animated fadeOutUp'
+		},
+		placement:{
+			align:'center'
 		},
 		mouse_over : 'pause',
-		template: '<div data-notify="container" class="bg-w col-xs-11 col-sm-3 bs-callout bs-callout-{0}" role="alert">' +
+		template: '<div data-notify="container" class="bg-w col-md-6 bs-callout bs-callout-{0}" role="alert">' +
 		'<button type="button" aria-hidden="true" class="close" data-notify="dismiss">×</button>' +
 		'<span data-notify="icon"></span> ' +
 		'<h4 data-notify="title">{1}</h4> ' +
 		'<span data-notify="message">{2}</span>' +
+		addhtml+
 		'<div class="progress" data-notify="progressbar">' +
 			'<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
 		'</div>' +