Merge branch 'develop' into develop-implement-scroll

Author: David Bengsch

dist/kuzzle.js

@@ -1317,8 +1317,7 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
    * a developer simply wish to verify his token
    */
   if (self.jwtToken !== undefined && !(object.controller === 'auth' && object.action === 'checkToken')) {
-    object.headers = object.headers || {};
-    object.headers.authorization = 'Bearer ' + self.jwtToken;
+    object.jwt = self.jwtToken;
   }
 
   if (queryArgs.collection) {

dist/kuzzle.js.map

@@ -1031,7 +1031,7 @@ describe('Kuzzle constructor', () => {
         should(kuzzle.offlineQueue[0].query.action).be.exactly('action');
         should(kuzzle.offlineQueue[0].query.controller).be.exactly('controller');
         should(kuzzle.offlineQueue[0].query.index).be.exactly('index');
-        should(kuzzle.offlineQueue[0].query.headers.authorization).be.exactly('Bearer fake-token');
+        should(kuzzle.offlineQueue[0].query.jwt).be.exactly('fake-token');
       });
     });
   });