diff --git a/jams-server/src/main/resources/webapp/js/auth.js b/jams-server/src/main/resources/webapp/js/auth.js index 44401ceaf658ad833e7d309fce454665a8762c3f..cc3335611d9c363d448bf28e8e7b557f1c4e635d 100644 --- a/jams-server/src/main/resources/webapp/js/auth.js +++ b/jams-server/src/main/resources/webapp/js/auth.js @@ -26,8 +26,6 @@ function signupPageHandler(data, statusCode, jqXHR) { // create Admin - console.log(data); - console.log(data.getResponseHeader('showLogin')); if(data.getResponseHeader('showLogin') == "false") { var inputConfirmPassword = '<div class="form-label-group"><label for="confirmPassword" class="label-title">Confirm Password</label><input type="password" name="confirmPassword" id="inputConfirmPassword" class="form-control" required autocomplete="off"><span id="message"></span></div>'; @@ -58,8 +56,10 @@ function checkAuthentication() { getServerConfigStatus(); } -function setLogout() { - return true; +function setLogout(data) { + if (data.status == 200) { + window.localStorage.removeItem('access_token'); + } } function authorizedAdmin() { diff --git a/jams-server/src/main/resources/webapp/templates/header.html b/jams-server/src/main/resources/webapp/templates/header.html index 44d27796b8f517055eab231dec862614a36a29ed..d3e26229ed55cc4540aa51e4dade4073c2470f76 100644 --- a/jams-server/src/main/resources/webapp/templates/header.html +++ b/jams-server/src/main/resources/webapp/templates/header.html @@ -59,7 +59,7 @@ $(".goSignup").on('click',function() { eraseCookie(keyUsername); eraseCookie(keyAdmin); - ajaxApiCall(api_path_get_logout, 'GET', null, null, setLogout, false); + ajaxApiCall(api_path_post_auth_login, 'DELETE', null, null, setLogout, false); window.location.href = "../templates/signup.html"; }); });