Merge branch 'feature-138-should-fail' of github.com:kuzzleio/sdk-javascript into feature-138-should-fail

Author: dbengsch

.travis.yml

@@ -18,7 +18,7 @@ install:
 - npm install
 env:
   global:
-    secure: EZ+XXJFDtehmag7wt8JbutqgzpkkJUCzkEWw6W+p7MIxWenLyuGv/RUu7KGqAloOud1cZbmZGSfRx/vsPvxRjo+ZC7aaPqb74qRvfctGdlJTtEffS2jFno1pEppJzCR4n7vocSfMVYtOD6oHP67lXwn/Qnh++WUkZaV137m5+7rqiYgJ+JTeSs5jBRZ6X7VNoNz8tZXejQ+FOymCFQTS2JM/rSZX9NEK+OwUEhEjRcxqWMm2avk6NAQNAL3WQuIBJQH8lxEJxOXkMc0rQZZ09AoLpqJKzsaicaZMInt5JstPo2e9vJfhi+PpRSNhErIff36aCHWRYYDPKl5x6IelZpBfZeTdrs4V2TbRi1y0ELbgMG1FHS4HAw3vTnh4/49g01lAJed4UguFRc6MzwTLAL8uPG/zFe8snm9+kaf4pL7yO89Hf3eltE03+N//tyVv+X/jdSca2dBZ9FMeLE5pJ2jlRiKitCLjXmLUEMMxEwNF7K/IvOrD9wue3JXK0UogOpcXfppk++pNTijsZluU1Yj7k3fGFeS8d6rIU0Yj40y6/VMaJeL4EXlARRsGLigUKVjQL6+/N5xudlsCng+EG+WVIy4wEEPH0QgjUkPTgWx1NrUlTwjskE0cdqDOBu39WkRFJHHECYFPTfTuDJ7xxuuibFTQmUFu2zjbYfYKhPE=
+    secure: J5FHR91BBBrVqS5QMl+ZC3Oi2UgyQpW5SlKhfCwXJU2rz8XHNWajT5hjihlNiE6SVuUDVNflCcJI7DRD7+hwCt+G0rL9UuLnkKuMGVuVc/vMAjYpjRoVgWHk4KSwN4qWYcbF0k9d5POelI36xFnuQM0ttb3kDi/8T1s26Vsqw2Db1YDoK94ZkqO633gwwmr9RX05+sLXIuKai1bfIjUGU3YTusY0hDVw78Sg+/o1qCHNVwLDutpae/wLypO1/hujgh8SjIkAQBa/yp1gT2W+ykIaApk8eZn630usVttdToDgh2Z5+RLcgHOMi/p2/NvB/XKDq+sYh55tuKtdzu6MNx1vEVolcfiPkI0yPzwAs1IgTxAtGpKVkRlIZNMyksAQBikLqI6iFJHqYcPDHo+R+IwrXXSwZL/gbcfAtLiYWx1JnZHL8KfFz5KvRtINA4iEopzTQrOPJibFYNMWMyybvx7cHe4SAbtZxKq6cCt3fUzvwzfTIQ8m5k6y+w/bOiYY/HV8zvNw5bCS1N6h/6u8mmZMw3wv9N9eQz+h2BKwSziWt27CXcUKl6HhHklR7zj3/b7HwKW1o7Y0cixTl8kUBC8k+093Mhg4FmJWEAacfXVzRDs5nEejronmNUTi8hnpsSBeNMQnuD99zQp+eIi5PjfZ9DsCCM85cYb/LG1HyLs=
 deploy:
   provider: npm
   skip_cleanup: true

deploy.sh

@@ -5,12 +5,12 @@ then
   echo "Push generated dist folder"
   git config --global user.email "[email protected]"
   git config --global user.name "Travis CI"
-  git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build
+  git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build > /dev/null 2>&1
   cd travis-build
   ln -s  ${TRAVIS_BUILD_DIR}/node_modules
   npm run build
   git add dist/
-  git commit -am "Travis CI - [ci skip] - automatic dist folder"
+  git commit -am "Travis CI - [ci skip] - automatic dist folder" > /dev/null 2>&1
   git push origin ${TRAVIS_BRANCH}
 fi
 

dist/kuzzle.js

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {
@@ -29,7 +29,7 @@
   "dependencies": {
     "bluebird": "3.4.6",
     "bufferutil": "^1.2.1",
-    "node-uuid": "1.4.7",
+    "uuid": "3.0.0",
     "utf-8-validate": "^1.2.1",
     "ws": "^1.1.1"
   },

dist/kuzzle.js.map

@@ -1,5 +1,5 @@
 var
-  uuid = require('node-uuid'),
+  uuid = require('uuid'),
   KuzzleDataCollection = require('./kuzzleDataCollection'),
   KuzzleSecurity = require('./security/kuzzleSecurity'),
   KuzzleMemoryStorage = require('./kuzzleMemoryStorage'),

package.json

@@ -1,5 +1,5 @@
 var
-  uuid = require('node-uuid');
+  uuid = require('uuid');
 
 /**
  * This is a global callback pattern, called by all asynchronous functions of the Kuzzle object.

src/kuzzle.js

@@ -44,7 +44,7 @@ function KuzzleSecurity(kuzzle) {
  * Retrieve a single Role using its unique role ID.
  *
  * @param {string} id
- * @param {object} [options] - Optional parameters
+ * @param {object|responseCallback} [options] - Optional parameters
  * @param {responseCallback} [cb] - returns Kuzzle's response
  */
 KuzzleSecurity.prototype.getRole = function (id, options, cb) {
@@ -78,7 +78,7 @@ KuzzleSecurity.prototype.getRole = function (id, options, cb) {
  * That means that a role that was just been created won’t be returned by this function.
  *
  * @param {Object} filters - this object can contains an array `indexes` with a list of index id, a integer `from` and a integer `size`
- * @param {object} [options] - Optional parameters
+ * @param {object|responseCallback} [options] - Optional parameters
  * @param {responseCallback} [cb] - returns Kuzzle's response
  *
  */
@@ -118,7 +118,7 @@ KuzzleSecurity.prototype.searchRoles = function (filters, options, cb) {
  *
  * @param {string} id - role identifier
  * @param {object} content - a plain javascript object representing the role
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  */
 KuzzleSecurity.prototype.createRole = function (id, content, options, cb) {
@@ -154,7 +154,7 @@ KuzzleSecurity.prototype.createRole = function (id, content, options, cb) {
  *
  * @param {string} id - role identifier
  * @param {object} content - a plain javascript object representing the role's modification
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -189,7 +189,7 @@ KuzzleSecurity.prototype.updateRole = function (id, content, options, cb) {
  *
  *
  * @param {string} id - Role id to delete
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -226,7 +226,7 @@ KuzzleSecurity.prototype.roleFactory = function(id, content) {
  *
  *
  * @param {string} id
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} cb - returns Kuzzle's response
  */
 KuzzleSecurity.prototype.getProfile = function (id, options, cb) {
@@ -262,7 +262,7 @@ KuzzleSecurity.prototype.getProfile = function (id, options, cb) {
  * That means that a profile that was just been created won’t be returned by this function.
  *
  * @param {Object} filters - this object can contains an array `roles` with a list of roles id, a integer `from` and a integer `size`
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - returns Kuzzle's response
  */
 KuzzleSecurity.prototype.searchProfiles = function (filters, options, cb) {
@@ -301,7 +301,7 @@ KuzzleSecurity.prototype.searchProfiles = function (filters, options, cb) {
  *
  * @param {string} id - profile identifier
  * @param {object} content - attribute `roles` in `content` must only contains an array of role id
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  */
 KuzzleSecurity.prototype.createProfile = function (id, content, options, cb) {
@@ -337,7 +337,7 @@ KuzzleSecurity.prototype.createProfile = function (id, content, options, cb) {
  *
  * @param {string} id - profile identifier
  * @param {object} content - a plain javascript object representing the profile's modification
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -385,7 +385,7 @@ KuzzleSecurity.prototype.updateProfile = function (id, content, options, cb) {
  *
  *
  * @param {string} id - Profile id to delete
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -420,7 +420,7 @@ KuzzleSecurity.prototype.profileFactory = function(id, content) {
  * Get a specific user from kuzzle using its unique ID
  *
  * @param {string} id
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} cb - returns Kuzzle's response
  */
 KuzzleSecurity.prototype.getUser = function (id, options, cb) {
@@ -452,7 +452,7 @@ KuzzleSecurity.prototype.getUser = function (id, options, cb) {
  * That means that a user that was just been created won’t be returned by this function.
  *
  * @param {Object} filters - same filters as documents filters
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - returns Kuzzle's response
  */
 KuzzleSecurity.prototype.searchUsers = function (filters, options, cb) {
@@ -490,8 +490,8 @@ KuzzleSecurity.prototype.searchUsers = function (filters, options, cb) {
  *        Replace the existing user otherwise
  *
  * @param {string} id - user identifier
- * @param {object} content - attribute `profile` in `content` must only contains the profile id
- * @param {object} [options] - (optional) arguments
+ * @param {object} content - attribute `profileIds` in `content` must only contain an array of profile ids
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  */
 KuzzleSecurity.prototype.createUser = function (id, content, options, cb) {
@@ -518,13 +518,47 @@ KuzzleSecurity.prototype.createUser = function (id, content, options, cb) {
   });
 };
 
+/**
+ * Create a new restricted user in Kuzzle.
+ *
+ * This function will create a new user. It is not usable to update an existing user.
+ * This function allows anonymous users to create a "restricted" user with predefined rights.
+ *
+ * @param {string} id - user identifier
+ * @param {object} content - attribute `profile` in `content` must only contains the profile id
+ * @param {object|responseCallback} [options] - (optional) arguments
+ * @param {responseCallback} [cb] - (optional) Handles the query response
+ */
+KuzzleSecurity.prototype.createRestrictedUser = function (id, content, options, cb) {
+  var
+    self = this,
+    data = {_id: id, body: content};
+
+  if (!id || typeof id !== 'string') {
+    throw new Error('KuzzleSecurity.createRestrictedUser: cannot create a user without a user ID');
+  }
+
+  if (content.profileIds) {
+    throw new Error('KuzzleSecurity.createRestrictedUser: cannot provide profileIds');
+  }
+
+  if (!cb && typeof options === 'function') {
+    cb = options;
+    options = null;
+  }
+
+  self.kuzzle.query(this.buildQueryArgs('createRestrictedUser'), data, null, cb && function (err, res) {
+    cb(err, err ? undefined : new KuzzleUser(self, res.result._id, res.result._source));
+  });
+};
+
 
 /**
  * Update an user in Kuzzle.
  *
  * @param {string} id - user identifier
  * @param {object} content - a plain javascript object representing the user's modification
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - (optional) Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -562,7 +596,7 @@ KuzzleSecurity.prototype.updateUser = function (id, content, options, cb) {
  *
  *
  * @param {string} id - Profile id to delete
- * @param {object} [options] - (optional) arguments
+ * @param {object|responseCallback} [options] - (optional) arguments
  * @param {responseCallback} [cb] - Handles the query response
  * @returns {KuzzleSecurity} this object
  */
@@ -654,8 +688,8 @@ KuzzleSecurity.prototype.isActionAllowed = function(rights, controller, action,
  * Gets the rights array of a given user.
  *
  * @param {string} userId The id of the user.
- * @param {object} [options] - (optional) arguments
- * @param {function} cb   The callback containing the normalized array of rights.
+ * @param {object|responseCallback} [options] - (optional) arguments
+ * @param {function} cb The callback containing the normalized array of rights.
  */
 KuzzleSecurity.prototype.getUserRights = function (userId, options, cb) {
   var

src/kuzzleRoom.js

@@ -1,6 +1,12 @@
 var
   KuzzleSecurityDocument = require('./kuzzleSecurityDocument');
 
+/**
+ * @param {KuzzleSecurity} kuzzleSecurity
+ * @param {string} id
+ * @param {Object} content
+ * @constructor
+ */
 function KuzzleUser(kuzzleSecurity, id, content) {
 
   KuzzleSecurityDocument.call(this, kuzzleSecurity, id, content);
@@ -21,7 +27,7 @@ function KuzzleUser(kuzzleSecurity, id, content) {
     return kuzzleSecurity.kuzzle.bluebird.promisifyAll(this, {
       suffix: 'Promise',
       filter: function (name, func, target, passes) {
-        var whitelist = ['save'];
+        var whitelist = ['save', 'saveRestricted'];
 
         return passes && whitelist.indexOf(name) !== -1;
       }
@@ -37,7 +43,7 @@ KuzzleUser.prototype = Object.create(KuzzleSecurityDocument.prototype, {
 
 /**
  * Set profiles in content
- * @param {array} profile - an array of profiles ids string
+ * @param {array} profileIds - an array of profiles ids string
  *
  * @returns {KuzzleUser} this
  */
@@ -53,7 +59,7 @@ KuzzleUser.prototype.setProfiles = function (profileIds) {
 
 /**
  * Add a profile
- * @param {string} profile - a profile ids string
+ * @param {string} profileId - a profile ids string
  *
  * @returns {KuzzleUser} this
  */
@@ -80,8 +86,8 @@ KuzzleUser.prototype.addProfile = function (profileId) {
  * Otherwise, this method will replace the latest version of this user in Kuzzle by the current content
  * of this object.
  *
+ * @param {object|responseCallback} [options] - Optional parameters
  * @param {responseCallback} [cb] - Handles the query response
- * @param {object} [options] - Optional parameters
  * @returns {KuzzleUser} this
  */
 KuzzleUser.prototype.save = function (options, cb) {
@@ -101,6 +107,34 @@ KuzzleUser.prototype.save = function (options, cb) {
   return self;
 };
 
+/**
+ * Saves this user as restricted into Kuzzle.
+ *
+ * This function will create a new user. It is not usable to update an existing user.
+ * The "profileIds" property must not be provided, or the request will be rejected by Kuzzle.
+ * This function allows anonymous users to create a "restricted" user with predefined rights.
+ *
+ * @param {object|responseCallback} [options] - Optional parameters
+ * @param {responseCallback} [cb] - Handles the query response
+ * @returns {KuzzleUser} this
+ */
+KuzzleUser.prototype.saveRestricted = function (options, cb) {
+  var
+    data = this.serialize(),
+    self = this;
+
+  if (options && cb === undefined && typeof options === 'function') {
+    cb = options;
+    options = null;
+  }
+
+  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('createRestrictedUser'), data, options, cb && function (error) {
+    cb(error, error ? undefined : self);
+  });
+
+  return self;
+};
+
 /**
  * Serialize this object into a JSON object
  *

src/security/kuzzleSecurity.js

@@ -197,7 +197,7 @@ describe('KuzzleSecurity user methods', function () {
       kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});
       kuzzle.query = queryStub;
       error = null;
-      result = { result: {_id: 'foobar', _source: {profileIds: ['myRole']}} };
+      result = { result: {_id: 'foobar', _source: {profileIds: ['myProfile']}} };
       expectedQuery = {
         action: 'createUser',
         controller: 'security'
@@ -264,6 +264,58 @@ describe('KuzzleSecurity user methods', function () {
     });
   });
 
+  describe('#createRestrictedUser', function () {
+    beforeEach(function () {
+      kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});
+      kuzzle.query = queryStub;
+      error = null;
+      result = {result: {_id: 'foobar', _source: {some: 'body'}}};
+      expectedQuery = {
+        action: 'createRestrictedUser',
+        controller: 'security'
+      };
+    });
+
+    it('should send the right query to Kuzzle', function (done) {
+      expectedQuery.body = result.result._source;
+      expectedQuery._id = result.result._id;
+
+      should(kuzzle.security.createRestrictedUser(result.result._id, result.result._source, function (err, res) {
+        should(err).be.null();
+        should(res).be.instanceof(KuzzleUser);
+        done();
+      }));
+    });
+
+    it('should send the right query to Kuzzle even without callback', function (done) {
+      expectedQuery.body = result.result._source;
+      expectedQuery._id = result.result._id;
+
+      kuzzle.security.createRestrictedUser(result.result._id, result.result._source);
+      done();
+    });
+
+    it('should throw an error if no id provided', function () {
+      should(function () { kuzzle.security.createRestrictedUser(null); }).throw(Error);
+    });
+
+    it('should throw an error if profileIds is provided', function () {
+      should(function () { kuzzle.security.createRestrictedUser(result.result._id, {profileIds: ['someProfile']}); }).throw(Error);
+    });
+
+    it('should call the callback with an error if one occurs', function (done) {
+      expectedQuery.body = result.result._source;
+      error = 'foobar';
+      this.timeout(50);
+
+      kuzzle.security.createRestrictedUser(result.result._id, result.result._source, function (err, res) {
+        should(err).be.exactly('foobar');
+        should(res).be.undefined();
+        done();
+      });
+    });
+  });
+
   describe('#updateUser', function () {
     beforeEach(function () {
       kuzzle = new Kuzzle('foo', {defaultIndex: 'bar'});