Skip to content

Fix network events #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 4, 2017
Merged

Fix network events #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1aa77c6
set exposed properties as described in the specs
scottinet Nov 21, 2017
9f99e6f
remove the "headers" property
scottinet Nov 21, 2017
25ffe27
change kuzzle.offlineQueue to read-only
scottinet Nov 23, 2017
21eaf6d
update license file
scottinet Nov 23, 2017
026ba02
simplify room subscription workflow
scottinet Nov 28, 2017
0b5b194
fix #53
scottinet Nov 28, 2017
99cb0d3
remove unused unsubscribe option
scottinet Nov 28, 2017
7ce6b32
unsetJwt should not trigger any event
scottinet Nov 29, 2017
9d2396a
Merge remote-tracking branch 'origin/6.x' into remove_room_renew
scottinet Nov 29, 2017
64d47ec
Merge remote-tracking branch 'origin/remove_room_renew' into fix_toke…
scottinet Nov 29, 2017
26dae5d
fix disconnection state value
scottinet Dec 4, 2017
7c5a1fe
Merge branch '6.x' into fix_tokenexpired_event
Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Kuzzle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ function Kuzzle (host, options, cb) {
var copy;

if (data.type === 'TokenExpired') {
return self.unsetJwt();
self.unsetJwt();
return self.emitEvent('tokenExpired');
}

if (data.type === 'document') {
Expand Down Expand Up @@ -346,6 +347,7 @@ function Kuzzle (host, options, cb) {

this.network.addListener('tokenExpired', function() {
self.unsetJwt();
self.emitEvent('tokenExpired');
});

if ((options && options.connect || 'auto') === 'auto') {
Expand Down Expand Up @@ -486,8 +488,6 @@ Kuzzle.prototype.setJwt = function(token) {
*/
Kuzzle.prototype.unsetJwt = function() {
this.jwt = undefined;
this.emitEvent('tokenExpired');

return this;
};

Expand Down
2 changes: 1 addition & 1 deletion src/networkWrapper/protocols/socketio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class SocketIO extends RTWrapper {
*/
close() {
this.forceDisconnect = true;
this.state = 'disconnected';
this.state = 'offline';
this.socket.close();
this.socket = null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/networkWrapper/protocols/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class WSNode extends RTWrapper {
* Closes the connection
*/
close () {
this.state = 'disconnected';
this.state = 'offline';
this.removeAllListeners();
this.wasConnected = false;
if (this.client) {
Expand Down
11 changes: 2 additions & 9 deletions test/kuzzle/connect.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,11 @@ describe('Kuzzle connect', function () {
});

it('should keep a valid JWT at reconnection', function () {
var
kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'}),
eventStub = sinon.stub();
var kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'});

kuzzle.checkToken = sinon.stub();

kuzzle.jwt = 'foobar';
kuzzle.addListener('tokenExpired', eventStub);

kuzzle.connect();
clock.tick();
Expand All @@ -118,18 +115,15 @@ describe('Kuzzle connect', function () {
kuzzle.checkToken.yield(null, {valid: true});

should(kuzzle.jwt).be.eql('foobar');
should(eventStub).not.be.called();
});

it('should empty the JWT at reconnection if it has expired', function () {
var
kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'}),
eventStub = sinon.stub();
kuzzle = new Kuzzle('somewhereagain', {connect: 'manual'});

kuzzle.checkToken = sinon.stub();

kuzzle.jwt = 'foobar';
kuzzle.addListener('tokenExpired', eventStub);

kuzzle.connect();
clock.tick();
Expand All @@ -139,7 +133,6 @@ describe('Kuzzle connect', function () {
kuzzle.checkToken.yield(null, {valid: false});

should(kuzzle.jwt).be.undefined();
should(eventStub).be.calledOnce();
});

it('should register listeners upon receiving a "disconnect" event', function () {
Expand Down
8 changes: 0 additions & 8 deletions test/kuzzle/methods.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,14 +983,6 @@ describe('Kuzzle methods', function () {
kuzzle.unsetJwt();
should(kuzzle.jwt).be.undefined();
});

it('should emit a "tokenExpired" event', function () {
var cb = sinon.stub();

kuzzle.addListener('tokenExpired', cb);
kuzzle.unsetJwt();
should(cb).be.calledOnce();
});
});

describe('#updateMyCredentials', function() {
Expand Down