diff --git a/debian/changelog b/debian/changelog index b067011e..51881885 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (23.6.17) stable; urgency=low +hedera-web (23.6.18) stable; urgency=low * Initial Release. diff --git a/js/vn/json-connection.js b/js/vn/json-connection.js index 6a088aaa..e06a0c4e 100644 --- a/js/vn/json-connection.js +++ b/js/vn/json-connection.js @@ -86,6 +86,7 @@ module.exports = new Class({ headers: {'Authorization': token} }; await this.post('Accounts/logout', null, config); + await this.send('user/logout'); } }, diff --git a/package.json b/package.json index 109f2cf3..155089d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.6.17", + "version": "23.6.18", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/user/logout.php b/rest/user/logout.php new file mode 100644 index 00000000..a7e7e849 --- /dev/null +++ b/rest/user/logout.php @@ -0,0 +1,7 @@ +getValue( 'SELECT userId FROM salix.AccessToken @@ -161,8 +158,10 @@ abstract class Service { [$token] ); - if (!$userId) + if (!$userId) { + $_SESSION['user'] = null; throw new SessionExpiredException(); + } $anonymousUser = FALSE; $user = $db->getValue( @@ -178,11 +177,12 @@ abstract class Service { [$user] ); - if (!$isActive) + if (!$isActive) { + $_SESSION['user'] = null; throw new UserDisabledException(); + } } - error_log("user: " . $user . "EndLine\n"); $db->query('CALL account.myUser_loginWithName(#)', [$user]); $userChanged = !$anonymousUser @@ -191,8 +191,6 @@ abstract class Service { $_SESSION['user'] = $user; // Registering the user access - error_log("SESSION_Access: " . $_SESSION['access'] . " _userChanged: " . $userChanged . " _SESSION_User: " . $_SESSION['user'] . "EndLine\n"); - error_log("End login logs\n"); if (isset($_SESSION['access']) && $userChanged) $db->query( 'CALL visitUser_new(#, #)',