Merge remote-tracking branch 'origin/develop' into feature-138-should-fail

Author: dbengsch

README.md

@@ -100,15 +100,18 @@ kuzzle
 
 ### Javascript
 
-You can install this SDK with [Bower](http://bower.io/).
-```
-bower install kuzzle-sdk --save
+Clone this github repository and run ``npm run build``. A ``dist`` directory will be created, containing a browser version of this SDK.
+
+
+```html
+<script type="text/javascript" src="dist/kuzzle.js"></script>
 ```
 
+If you want to support older browser versions, you may load `socket.io` before Kuzzle, making the SDK compatible with browsers without websocket support:
+
 ```html
-<!-- Don't forget to include socketio before kuzzle -->
-<script type="text/javascript" src="bower_components/socket.io-client/socket.io.js"></script>
-<script type="text/javascript" src="bower_components/kuzzle-sdk/dist/kuzzle.min.js"></script>
+<!-- Don't forget to include socketio before kuzzle SDK -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.6.0/socket.io.min.js"></script>
 ```
 
 #### <a name="basic-usage-js"></a> Basic usage
@@ -137,10 +140,6 @@ kuzzle
 });
 ```
 
-## Building manually
-
-Clone this github repository and run ``grunt``. A ``dist`` directory will be created, containing a plain browserified version of this SDK, and a minified version.
-
 ## Migrating from SDK v1.x
 
 * Kuzzle constructor has been changed. Instead of an URL, you have to provide a resolvable server name, or an IP address. If you need to specify a port different than the provided default values, you can do so using these two new options: `wsPort` (WebSocket port) and `ioPort` (Socket.IO port)

bower.json

@@ -1291,8 +1291,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

@@ -1017,7 +1017,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');
       });
     });
   });

dist/kuzzle.js.map

@@ -21,7 +21,6 @@ module.exports = {
     setImmediate: false
   },
   module: {
-    noParse: [/ws/, /crypto/, /buffer/, /node-uuid/],
     loaders: [
       {
         test: /\.js$/,