diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js
index e154572c..17c27557 100644
--- a/assets/webconfig/js/content_index.js
+++ b/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) {
diff --git a/assets/webconfig/js/hyperion.js b/assets/webconfig/js/hyperion.js
index 9ade4a86..6a05d6a5 100644
--- a/assets/webconfig/js/hyperion.js
+++ b/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)
diff --git a/assets/webconfig/js/settings.js b/assets/webconfig/js/settings.js
index 065fd223..f8defa3e 100644
--- a/assets/webconfig/js/settings.js
+++ b/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);
diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js
index 2c3b8ac7..4f3d8bad 100644
--- a/assets/webconfig/js/ui_utils.js
+++ b/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('');
$('#id_footer_rename').append('');
}
+ else if (type == "changePassword")
+ {
+ $('#id_body_rename').html('
'); + $('#id_body_rename').append('
'); + $('#id_body_rename').append(''); + $('#id_footer_rename').html(''); + $('#id_footer_rename').append(''); + } else if (type == "checklist") { $('#id_body').html('
');
@@ -315,7 +335,7 @@ function showInfoDialog(type,header,message)
$('#id_body').append('');
- $(type == "renInst" ? "#modal_dialog_rename" : "#modal_dialog").modal({
+ $(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({
backdrop : "static",
keyboard: false,
show: true
'); + $('#id_body_rename').append('
'+header+'
'); + $('#id_body_rename').append(''); + $('#id_body_rename').append(''); + $('#id_footer_rename').html(''); + $('#id_footer_rename').append(''); + } else if (type == "checklist") { $('#id_body').html('
');
@@ -315,7 +335,7 @@ function showInfoDialog(type,header,message)
$('#id_body').append('');
- $(type == "renInst" ? "#modal_dialog_rename" : "#modal_dialog").modal({
+ $(type == "renInst" || type == "changePassword" ? "#modal_dialog_rename" : "#modal_dialog").modal({
backdrop : "static",
keyboard: false,
show: true