From a1342e11ed020630e9bde306b3ef8df3a5b8aaf1 Mon Sep 17 00:00:00 2001 From: Guillaume Royer Date: Mon, 21 Jan 2019 16:44:06 +0000 Subject: [PATCH 1/3] fix(parser): remove label as it does not work on all node versions --- src/queries/build/parser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/queries/build/parser.js b/src/queries/build/parser.js index ec90f69..99e1467 100644 --- a/src/queries/build/parser.js +++ b/src/queries/build/parser.js @@ -162,7 +162,6 @@ parse: function parse(input) { vstack.length = vstack.length - n; lstack.length = lstack.length - n; } - _token_stack: var lex = function () { var token; token = lexer.lex() || EOF; -- 2.30.9 From a09b0ce537a50c61f1ba85672bbb75f568317bb4 Mon Sep 17 00:00:00 2001 From: Guillaume Royer Date: Tue, 22 Jan 2019 09:19:54 +0000 Subject: [PATCH 2/3] fix(xhr2): handle FormData response type --- external/xhr2.js | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/external/xhr2.js b/external/xhr2.js index 59509de..4824b1e 100644 --- a/external/xhr2.js +++ b/external/xhr2.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.12.2 +// Generated by CoffeeScript 1.12.7 (function() { var InvalidStateError, NetworkError, ProgressEvent, SecurityError, SyntaxError, XMLHttpRequest, XMLHttpRequestEventTarget, XMLHttpRequestUpload, http, https, os, url, extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, @@ -323,7 +323,7 @@ 'access-control-request-method': true, connection: true, 'content-length': true, - // cookie: true, + cookie: true, cookie2: true, date: true, dnt: true, @@ -341,7 +341,7 @@ }; XMLHttpRequest.prototype._privateHeaders = { - // 'set-cookie': true, + 'set-cookie': true, 'set-cookie2': true }; @@ -363,6 +363,7 @@ }; XMLHttpRequest.prototype._sendHttp = function(data) { + var that; if (this._sync) { throw new Error("Synchronous XHR processing not implemented"); } @@ -372,9 +373,11 @@ } else { data || (data = ''); } - this.upload._setData(data); - this._finalizeHeaders(); - this._sendHxxpRequest(); + that = this; + this.upload._setData(data, function() { + that._finalizeHeaders(); + return that._sendHxxpRequest(); + }); return void 0; }; @@ -709,11 +712,13 @@ XMLHttpRequest.XMLHttpRequest = XMLHttpRequest; + XMLHttpRequest.FormData = FormData; + SecurityError = (function(superClass) { extend(SecurityError, superClass); function SecurityError() { - SecurityError.__super__.constructor.apply(this, arguments); + SecurityError.__super__.constructor.call(this); } return SecurityError; @@ -726,7 +731,7 @@ extend(InvalidStateError, superClass); function InvalidStateError() { - InvalidStateError.__super__.constructor.apply(this, arguments); + InvalidStateError.__super__.constructor.call(this); } return InvalidStateError; @@ -750,7 +755,7 @@ extend(NetworkError, superClass); function NetworkError() { - NetworkError.__super__.constructor.apply(this, arguments); + NetworkError.__super__.constructor.call(this); } return NetworkError; @@ -763,7 +768,7 @@ extend(SyntaxError, superClass); function SyntaxError() { - SyntaxError.__super__.constructor.apply(this, arguments); + SyntaxError.__super__.constructor.call(this); } return SyntaxError; @@ -813,10 +818,10 @@ return void 0; }; - XMLHttpRequestUpload.prototype._setData = function(data) { - var body, i, j, k, offset, ref, ref1, view; + XMLHttpRequestUpload.prototype._setData = function(data, cb) { + var body, i, j, k, offset, ref, ref1, that, view; if (typeof data === 'undefined' || data === null) { - return; + return cb(); } if (typeof data === 'string') { if (data.length !== 0) { @@ -840,10 +845,23 @@ body[i] = view[i + offset]; } this._body = body; + } else if (data instanceof FormData) { + body = ''; + this._contentType = data.getHeaders()['content-type']; + data.on('data', function(data) { + return body += data.toString(); + }); + that = this; + data.on('end', function() { + that._body = body; + return cb(); + }); + data.resume(); + return; } else { throw new Error("Unsupported send() data " + data); } - return void 0; + return cb(); }; XMLHttpRequestUpload.prototype._finalizeHeaders = function(headers, loweredHeaders) { @@ -872,4 +890,4 @@ XMLHttpRequest.XMLHttpRequestUpload = XMLHttpRequestUpload; -}).call(this); \ No newline at end of file +}).call(this); -- 2.30.9 From 6fe1753a4fa77d55b08a5b30e31f438a252a7e7c Mon Sep 17 00:00:00 2001 From: Guillaume Royer Date: Wed, 23 Jan 2019 15:02:57 +0000 Subject: [PATCH 3/3] fix(erp5 storage): add Accept to headers to fix response error --- src/jio.storage/erp5storage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jio.storage/erp5storage.js b/src/jio.storage/erp5storage.js index d9078ff..c07fc8e 100644 --- a/src/jio.storage/erp5storage.js +++ b/src/jio.storage/erp5storage.js @@ -42,6 +42,7 @@ if (options.headers === undefined) { options.headers = {}; } + options.headers.Accept = "*/*"; options.headers['X-ACCESS-TOKEN'] = storage._access_token; options.xhrFields.withCredentials = false; } else { -- 2.30.9