Merge branch '730-logout-issue' into 'devel_12.2.x'

Resolve "logout problem"

See merge request minerva/core!668

model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java

@@ -184,13 +184,13 @@ public enum ConfigurationElementType {
       ConfigurationElementEditType.TEXT, false, ConfigurationElementTypeGroup.EMAIL_NOTIFICATION),
 
   DEFAULT_VIEW_PROJECT("Default user privilege for: " + PrivilegeType.VIEW_PROJECT.getCommonName(), "true",
-      ConfigurationElementEditType.BOOLEAN, true, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
+      ConfigurationElementEditType.BOOLEAN, false, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
 
   DEFAULT_EDIT_COMMENTS_PROJECT("Default user privilege for: " + PrivilegeType.EDIT_COMMENTS_PROJECT.getCommonName(),
-      "false", ConfigurationElementEditType.BOOLEAN, true, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
+      "false", ConfigurationElementEditType.BOOLEAN, false, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
 
   DEFAULT_LAYOUT_MANAGEMENT("Default user privilege for: " + PrivilegeType.LAYOUT_MANAGEMENT.getCommonName(), "false",
-      ConfigurationElementEditType.BOOLEAN, true, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
+      ConfigurationElementEditType.BOOLEAN, false, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
 
   SHOW_REACTION_TYPE("Show reaction type", "true", ConfigurationElementEditType.BOOLEAN, false,
       ConfigurationElementTypeGroup.SEARCH_VISIBLE_PARAMETERS),
@@ -232,7 +232,7 @@ public enum ConfigurationElementType {
       ConfigurationElementEditType.STRING, true, ConfigurationElementTypeGroup.LDAP_CONFIGURATION),
 
   DEFAULT_CUSTOM_LAYOUTS("Default user privilege for: " + PrivilegeType.CUSTOM_LAYOUTS.getCommonName(), "0",
-      ConfigurationElementEditType.INTEGER, true, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
+      ConfigurationElementEditType.INTEGER, false, ConfigurationElementTypeGroup.DEFAULT_USER_PRIVILEGES),
 
   LDAP_UID("LDAP login (user id)", "uid", ConfigurationElementEditType.STRING, true,
       ConfigurationElementTypeGroup.LDAP_CONFIGURATION),

rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java

@@ -154,9 +154,10 @@ public class UserController extends BaseController {
     if (auth != null) {
       new SecurityContextLogoutHandler().logout(request, response, auth);
     }
+    //for some reason spring doesn't invalidate sessionRegistry data on logout
+    userService.logout(token);
 
     Map<String, Object> result = new TreeMap<>();
-    result.put("status", "OK");
 
     final Boolean useSecureCookie = false;
     final String cookiePath = "/";