Merge branch 'fix/Forum.getServiceAccessError' into 'develop'

Merge of fix/Forum.getServiceAccessError to develop

See merge request o2oa/o2oa!100

o2web/source/x_component_Forum/TopNode.js

@@ -346,11 +346,35 @@ MWF.xApplication.Forum.TopNode = new Class({
         });
     },
     logout: function(){
-        MWF.Actions.get("x_organization_assemble_authentication").logout( function(){
-            layout.desktop.session.user.distinguishedName = "anonymous";
-            this.app.clearContent();
-            this.app.loadApplicationContent();
-            this.openLoginForm();
-        }.bind(this))
+        MWF.Actions.get("x_organization_assemble_authentication").logout(function () {
+            if (this.socket) {
+                this.socket.close();
+                this.socket = null;
+            }
+            Cookie.dispose("x-token");
+            delete layout.desktop.session.user.token;
+            delete layout.desktop.session.user.tokenType;
+            layout.desktop.session.user = {
+                distinguishedName : "anonymous",
+                name : "anonymous",
+                tokenType : "anonymous"
+            }
+
+            if( window.location.href.indexOf("/app.html") > 0 ){
+                window.location.reload();
+            }else{
+                this.app.clearContent();
+                this.app.loadApplicationContent();
+                this.openLoginForm();
+            }
+            //window.location.reload();
+        }.bind(this));
+
+        // MWF.Actions.get("x_organization_assemble_authentication").logout( function(){
+        //     layout.desktop.session.user.distinguishedName = "anonymous";
+        //     this.app.clearContent();
+        //     this.app.loadApplicationContent();
+        //     this.openLoginForm();
+        // }.bind(this))
     }
 });
\ No newline at end of file

o2web/source/x_component_process_Xform/$Input.js

@@ -312,6 +312,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
             }
 
             if (!parentNode.isIntoView()) parentNode.scrollIntoView();
+
         }
     },
     showNotValidationMode: function(node){

o2web/source/x_desktop/js/forum.js

@@ -16,6 +16,9 @@ o2.addReady(function(){
 
         MWF.require("MWF.xDesktop.Layout", function(){
             MWF.require("MWF.xDesktop.Authentication", null, false);
+            MWF.require("MWF.xDesktop.Common", null, false);
+            MWF.require("MWF.xAction.RestActions", null, false);
+            MWF.require("MWF.xDesktop.Access", null, false);
             MWF.xDesktop.requireApp("Common", "", null, false);
             (function(){
                 layout.requireApp = function(appNames, callback, clazzName){

o2web/source/x_desktop/js/forumDocMobile.js

@@ -17,7 +17,9 @@ o2.addReady(function(){
 
         MWF.require("MWF.xDesktop.Layout", function(){
             MWF.require("MWF.xDesktop.Authentication", null, false);
-
+            MWF.require("MWF.xDesktop.Common", null, false);
+            MWF.require("MWF.xAction.RestActions", null, false);
+            MWF.require("MWF.xDesktop.Access", null, false);
             (function(){
                 layout.load = function(){
                     if (this.isAuthentication()){