diff --git a/jams-server/src/main/resources/webapp/js/api.js b/jams-server/src/main/resources/webapp/js/api.js index 03ff6c8a98c44df83d2a8bfb0cb90f90fba61d43..a5ad018c4d08173e90b59c66ba16dc396076d31a 100644 --- a/jams-server/src/main/resources/webapp/js/api.js +++ b/jams-server/src/main/resources/webapp/js/api.js @@ -18,24 +18,14 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -var key = 'JSESSIONID'; -var keyUsername = 'username'; -var keyAdmin = 'isAdmin'; -var cookie = ''; -var connectedUsername = ''; var admin_account = false; var isAdmin = false; var isSearch = false; -var uri_endpoint = ''; var uri = ''; -var apiCheck = false; var current_uri = window.location.href; var backend_address = new URL(window.location.href); var url_path = backend_address.protocol + "//" + backend_address.hostname; var url_port = backend_address.port; -var ca_setup_page = 'ca-setup.html'; -var identity_management_page = 'identity-management.html'; -var server_parameters_page = 'server-parameters.html'; var api_path_post_install_admin = '/api/install/start'; var api_path_post_auth_login = '/api/login'; var api_path_post_install_ca = '/api/install/ca'; diff --git a/jams-server/src/main/resources/webapp/templates/header.html b/jams-server/src/main/resources/webapp/templates/header.html index 8c26d87a31ff417d8c91610ae163e8f2b89832ac..745e8ad7a7aaf0cdc926d225f8b96c21da9f0dec 100644 --- a/jams-server/src/main/resources/webapp/templates/header.html +++ b/jams-server/src/main/resources/webapp/templates/header.html @@ -27,14 +27,15 @@ $(function() { var logoutTemplate = ""; var logoutTemplate2 = ""; - var currentUser = "User" - if (isAdmin) { + var currentUser = "User"; + + if (window.localStorage.getItem('access_token') != null && getAdminStatus()) { logoutTemplate = '<div class="container-fluid"><div class="row"><div class="col-xl-12 col-lg-12 col-md-12 col-sm-12"><div class="wrapper-logout"><div class="left"></div></li></ul></div></div></div></div>'; - logoutTemplate2 = '<ul class="nav navbar-nav ml-auto"><li class="nav-item dropdown"><a style="color: #ffffff; text-align: right;" href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i>' + currentUser + '</a><div class="dropdown-menu dropdown-menu-right"><a href="config.html"><button type="button" class="dropdown-item"><i class="fa fa-cog" aria-hidden="true"></i>Configurations</button></a><div class="dropdown-divider"></div><button type="button" class="logout_link dropdown-item" data-toggle="modal" data-target="#logoutModalCenter"><i class="fa fa-sign-out" aria-hidden="true"></i>Log out</button></div>' + logoutTemplate2 = '<ul class="nav navbar-nav ml-auto"><li class="nav-item dropdown"><a style="color: #ffffff; text-align: right;" href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i>' + (JSON.parse(atob(window.localStorage.getItem('access_token').split('.')[1]))).sub + '</a><div class="dropdown-menu dropdown-menu-right"><a href="config.html"><button type="button" class="dropdown-item"><i class="fa fa-cog" aria-hidden="true"></i>Configurations</button></a><div class="dropdown-divider"></div><button type="button" class="logout_link dropdown-item" data-toggle="modal" data-target="#logoutModalCenter"><i class="fa fa-sign-out" aria-hidden="true"></i>Log out</button></div>' } else { logoutTemplate = '<div class="container-fluid"><div class="row"><div class="col-xl-12 col-lg-12 col-md-12 col-sm-12"><div class="wrapper-logout"><div class="left"></div></li></ul></div></div></div></div>'; - logoutTemplate2 = '<ul class="nav navbar-nav ml-auto"><li class="nav-item dropdown"><a style="color: #ffffff; text-align: right;" href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i>' + currentUser + '</a><div class="dropdown-menu dropdown-menu-right"><div class="dropdown-divider"></div><button type="button" class="logout_link dropdown-item" data-toggle="modal" data-target="#logoutModalCenter"><i class="fa fa-sign-out" aria-hidden="true"></i>Log out</button></div>' + logoutTemplate2 = '<ul class="nav navbar-nav ml-auto"><li class="nav-item dropdown"><a style="color: #ffffff; text-align: right;" href="#" class="nav-link dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i>' + getUser() + '</a><div class="dropdown-menu dropdown-menu-right"><div class="dropdown-divider"></div><button type="button" class="logout_link dropdown-item" data-toggle="modal" data-target="#logoutModalCenter"><i class="fa fa-sign-out" aria-hidden="true"></i>Log out</button></div>' } if ((window.location.href.indexOf("ca-setup") > -1) || @@ -46,7 +47,6 @@ $(".logout").append(logoutTemplate); $(".right").prepend(logoutTemplate2); } else { - console.log("display none"); $(".logout").css("display", "none"); $(".right").css("display", "none"); }