Merge pull request #56 from kuzzleio/loginNotQueuable

made login and logout not queuable

Author: benoitvidis

dist/kuzzle.js

@@ -677,7 +677,7 @@ Kuzzle.prototype.login = function (strategy, credentials, expiresIn, cb) {
     request.expiresIn = expiresIn;
   }
 
-  this.query({controller: 'auth', action: 'login'}, {body: request}, {}, function(error, response) {
+  this.query({controller: 'auth', action: 'login'}, {body: request}, {queuable: false}, function(error, response) {
     if (error === null) {
       self.setJwtToken(response.result.jwt);
       renewAllSubscriptions.call(self);
@@ -713,7 +713,7 @@ Kuzzle.prototype.logout = function (cb) {
       body: {}
     };
 
-  this.query({controller: 'auth', action: 'logout'}, request, {}, function(error) {
+  this.query({controller: 'auth', action: 'logout'}, request, {queuable: false}, function(error) {
     if (error === null) {
       self.setJwtToken(undefined);
 
@@ -1249,7 +1249,11 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
   }
 
   if (self.state === 'connected' || (options && options.queuable === false)) {
-    emitRequest.call(this, object, cb);
+    if (self.state === 'connected') {
+      emitRequest.call(this, object, cb);
+    } else if (cb) {
+      cb(new Error('Unable to execute request: not connected to a Kuzzle server.\nDiscarded request: ' + object));
+    }
   } else if (self.queuing|| ['initializing', 'connecting'].indexOf(self.state) !== -1) {
     cleanQueue.call(this, object, cb);
 

dist/kuzzle.min.js

@@ -402,7 +402,7 @@ Kuzzle.prototype.login = function (strategy, credentials, expiresIn, cb) {
     request.expiresIn = expiresIn;
   }
 
-  this.query({controller: 'auth', action: 'login'}, {body: request}, {}, function(error, response) {
+  this.query({controller: 'auth', action: 'login'}, {body: request}, {queuable: false}, function(error, response) {
     if (error === null) {
       self.setJwtToken(response.result.jwt);
       renewAllSubscriptions.call(self);
@@ -438,7 +438,7 @@ Kuzzle.prototype.logout = function (cb) {
       body: {}
     };
 
-  this.query({controller: 'auth', action: 'logout'}, request, {}, function(error) {
+  this.query({controller: 'auth', action: 'logout'}, request, {queuable: false}, function(error) {
     if (error === null) {
       self.setJwtToken(undefined);
 
@@ -974,7 +974,11 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
   }
 
   if (self.state === 'connected' || (options && options.queuable === false)) {
-    emitRequest.call(this, object, cb);
+    if (self.state === 'connected') {
+      emitRequest.call(this, object, cb);
+    } else if (cb) {
+      cb(new Error('Unable to execute request: not connected to a Kuzzle server.\nDiscarded request: ' + object));
+    }
   } else if (self.queuing|| ['initializing', 'connecting'].indexOf(self.state) !== -1) {
     cleanQueue.call(this, object, cb);
 

dist/kuzzle.min.map

@@ -851,7 +851,7 @@ describe('Kuzzle constructor', () => {
         }
       });
 
-      it('should be able to send a login request', function () {
+      it('should be able to send a login request', function (done) {
         var
           kuzzle,
           loginCredentials = {username: 'foo', password: 'bar'};
@@ -862,16 +862,17 @@ describe('Kuzzle constructor', () => {
           connect: 'manual'
         });
 
-        kuzzle.queuing = true;
+        kuzzle.query = function(queryArgs, query, options) {
+          should(queryArgs.action).be.exactly('login');
+          should(queryArgs.controller).be.exactly('auth');
+          should(query.body.username).be.exactly('foo');
+          should(query.body.password).be.exactly('bar');
+          should(query.body.expiresIn).be.exactly('1h');
+          should(options.queuable).be.false();
+          done();
+        };
 
         kuzzle.login('local', loginCredentials, '1h');
-
-        should(kuzzle.offlineQueue.length).be.exactly(1);
-        should(kuzzle.offlineQueue[0].query.action).be.exactly('login');
-        should(kuzzle.offlineQueue[0].query.controller).be.exactly('auth');
-        should(kuzzle.offlineQueue[0].query.body.username).be.exactly('foo');
-        should(kuzzle.offlineQueue[0].query.body.password).be.exactly('bar');
-        should(kuzzle.offlineQueue[0].query.body.expiresIn).be.exactly('1h');
       });
 
       it('should forward token when logged in', function () {

src/kuzzle.js

@@ -204,7 +204,7 @@ describe('Query management', function () {
     });
 
     it('should emit the request directly without waiting the end of dequeuing if queuable is false', function () {
-      kuzzle.state = 'reconnecting';
+      kuzzle.state = 'connected';
       kuzzle.query(queryArgs, { body: { some: 'query'}}, {queuable: false});
       should(emitted).be.true();
 
@@ -214,6 +214,23 @@ describe('Query management', function () {
       should(emitted).be.true();
     });
 
+    it('should discard the request if not connected and if queuable is false', function () {
+      var
+        errorRaised = false,
+        callback = () => errorRaised = true;
+
+      kuzzle.state = 'reconnecting';
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {queuable: false}, callback);
+      should(emitted).be.false();
+      should(errorRaised).be.true();
+
+      errorRaised = false;
+      kuzzle.queuing = true;
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, {queuable: false}, callback);
+      should(emitted).be.false();
+      should(errorRaised).be.true();
+    });
+
     it('should queue the request during offline mode, if queuing has been activated', function () {
       var
         query = { body: { some: 'query'}},