[MERGE] forward port branch 11.0 up to b05e4d5f958

2 files changed, 60 insertions, 41 deletions

diff --git a/addons/web/static/src/js/core/ajax.js b/addons/web/static/src/js/core/ajax.js
index d6c67eacaec..f1f73bb5a28 100644
--- a/addons/web/static/src/js/core/ajax.js
+++ b/addons/web/static/src/js/core/ajax.js
@@ -5,7 +5,12 @@ var core = require('web.core');
 var utils = require('web.utils');
 var time = require('web.time');
 
-function genericJsonRpc (fct_name, params, fct) {
+function genericJsonRpc (fct_name, params, settings, fct) {
+    var shadow = settings.shadow || false;
+    delete settings.shadow;
+    if (! shadow)
+        core.bus.trigger('rpc_request');
+
     var data = {
         jsonrpc: "2.0",
         method: fct_name,
@@ -30,11 +35,49 @@ function genericJsonRpc (fct_name, params, fct) {
     });
     // FIXME: jsonp?
     result.abort = function () { if (xhr.abort) xhr.abort(); };
-    return result;
+
+    var p = result.then(function (result) {
+        if (!shadow) {
+            core.bus.trigger('rpc_response');
+        }
+        return result;
+    }, function (type, error, textStatus, errorThrown) {
+        if (type === "server") {
+            if (!shadow) {
+                core.bus.trigger('rpc_response');
+            }
+            if (error.code === 100) {
+                core.bus.trigger('invalidate_session');
+            }
+            return $.Deferred().reject(error, $.Event());
+        } else {
+            if (!shadow) {
+                core.bus.trigger('rpc_response_failed');
+            }
+            var nerror = {
+                code: -32098,
+                message: "XmlHttpRequestError " + errorThrown,
+                data: {
+                    type: "xhr"+textStatus,
+                    debug: error.responseText,
+                    objects: [error, errorThrown]
+                },
+            };
+            return $.Deferred().reject(nerror, $.Event());
+        }
+    });
+    return p.fail(function () { // Allow deferred user to disable rpc_error call in fail
+        p.fail(function (error, event) {
+            if (!event.isDefaultPrevented()) {
+                core.bus.trigger('rpc_error', error, event);
+            }
+        });
+    });
 }
 
 function jsonRpc(url, fct_name, params, settings) {
-    return genericJsonRpc(fct_name, params, function(data) {
+    settings = settings || {};
+    return genericJsonRpc(fct_name, params, settings, function(data) {
         return $.ajax(url, _.extend({}, settings, {
             url: url,
             dataType: 'json',
@@ -47,7 +90,7 @@ function jsonRpc(url, fct_name, params, settings) {
 
 function jsonpRpc(url, fct_name, params, settings) {
     settings = settings || {};
-    return genericJsonRpc(fct_name, params, function(data) {
+    return genericJsonRpc(fct_name, params, settings, function(data) {
         var payload_str = JSON.stringify(data, time.date_to_utc);
         var payload_url = $.param({r:payload_str});
         var force2step = settings.force2step || false;
diff --git a/addons/web/static/src/js/core/session.js b/addons/web/static/src/js/core/session.js
index 4760867e99f..cc372877e6d 100644
--- a/addons/web/static/src/js/core/session.js
+++ b/addons/web/static/src/js/core/session.js
@@ -49,6 +49,7 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
         this.qweb_mutex = new concurrency.Mutex();
         this.currencies = {};
         this._groups_def = {};
+        core.bus.on('invalidate_session', this, this._onInvalidateSession);
     },
     setup: function (origin, options) {
         // must be able to customize server
@@ -327,23 +328,17 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
     rpc: function (url, params, options) {
         var self = this;
         options = _.clone(options || {});
-        var shadow = options.shadow || false;
         options.headers = _.extend({}, options.headers);
         if (odoo.debug) {
             options.headers["X-Debug-Mode"] = $.deparam($.param.querystring()).debug;
         }
 
-        delete options.shadow;
-
         return self.check_session_id().then(function () {
             // TODO: remove
             if (! _.isString(url)) {
                 _.extend(options, url);
                 url = url.url;
             }
-            // TODO correct handling of timeouts
-            if (! shadow)
-                self.trigger('request');
             var fct;
             if (self.origin_server) {
                 fct = ajax.jsonRpc;
@@ -362,37 +357,7 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
                 url = self.url(url, null);
                 options.session_id = self.session_id || '';
             }
-            var p = fct(url, "call", params, options);
-            p = p.then(function (result) {
-                if (! shadow)
-                    self.trigger('response');
-                return result;
-            }, function (type, error, textStatus, errorThrown) {
-                if (type === "server") {
-                    if (! shadow)
-                        self.trigger('response');
-                    if (error.code === 100) {
-                        self.uid = false;
-                    }
-                    return $.Deferred().reject(error, $.Event());
-                } else {
-                    if (! shadow)
-                        self.trigger('response_failed');
-                    var nerror = {
-                        code: -32098,
-                        message: "XmlHttpRequestError " + errorThrown,
-                        data: {type: "xhr"+textStatus, debug: error.responseText, objects: [error, errorThrown] }
-                    };
-                    return $.Deferred().reject(nerror, $.Event());
-                }
-            });
-            return p.fail(function () { // Allow deferred user to disable rpc_error call in fail
-                p.fail(function (error, event) {
-                    if (!event.isDefaultPrevented()) {
-                        self.trigger('error', error, event);
-                    }
-                });
-            });
+            return fct(url, "call", params, options);
         });
     },
     url: function (path, params) {
@@ -418,6 +383,17 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
     getTZOffset: function (date) {
         return -new Date(date).getTimezoneOffset();
     },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * @private
+     */
+    _onInvalidateSession: function () {
+        this.uid = false;
+    },
 });
 
 return Session;