Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2328

o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js

@@ -43,7 +43,7 @@ MWF.xAction.RestActions.Action["x_organization_assemble_authentication"] = new C
         this.action.invoke({"name": "getAuthentication",
             "success": function(json, responseText){
                 if (json.data.tokenType!=="anonymous" || layout.anonymous){
-                    if (!json.roleList) roleList: [];
+                    if (json.data && !json.data.roleList) json.data.roleList = [];
                     if (success) success(json);
                 }else{
                     if (failure) failure(null, responseText, json.message);