Merge pull request #60 from kuzzleio/fix-security-hydrate-user

fix hydrate user and replace in setContent

Author: stafyniaksacha

.eslintrc

@@ -1,6 +1,6 @@
 {
   "rules": {
-    "consistent-return": 2,
+    "consistent-return": 0,
     "curly": 2,
     "dot-notation": 2,
     "eqeqeq": 2,
@@ -44,7 +44,7 @@
     "no-with": 2,
     "quotes": [2, "single"],
     "semi": [2, "always"],
-    "space-after-keywords": 2,
+    "keyword-spacing": 2,
     "space-before-blocks": 2,
     "space-in-parens": [2, "never"],
     "vars-on-top": 2,

src/security/kuzzleProfile.js

@@ -162,7 +162,7 @@ KuzzleProfile.prototype.hydrate = function (options, cb) {
       return cb(error);
     }
 
-    cb(null, new KuzzleProfile(self, response.result._id, response.result._source));
+    cb(null, new KuzzleProfile(self, self.id, {roles: response.result.hits}));
   });
 };
 

src/security/kuzzleSecurityDocument.js

@@ -27,7 +27,7 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
   });
 
   if (content) {
-    this.setContent(content);
+    this.setContent(content, true);
   }
 
   // promisifying
@@ -44,13 +44,25 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
 }
 
 /**
+ * Replaces the current content with new data.
+ * Changes made by this function won’t be applied until the save method is called.
  *
  * @param {Object} data - New securityDocument content
+ * @param {boolean} replace - if true: replace this document content with the provided data.
  *
  * @return {Object} this
  */
-KuzzleSecurityDocument.prototype.setContent = function (data) {
-  this.content = data;
+KuzzleSecurityDocument.prototype.setContent = function (data, replace) {
+  var self = this;
+
+  if (replace) {
+    this.content = data;
+  }
+  else {
+    Object.keys(data).forEach(function (key) {
+      self.content[key] = data[key];
+    });
+  }
 
   return this;
 };

src/security/kuzzleUser.js

@@ -61,11 +61,16 @@ KuzzleUser.prototype.hydrate = function (options, cb) {
   }
 
   self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('getProfile'), {_id: this.content.profile}, options, function (error, response) {
+    var hydratedUser;
+
     if (error) {
       return cb(error);
     }
 
-    cb(null, new KuzzleUser(self, response.result._id, response.result._source));
+    hydratedUser = new KuzzleUser(self.kuzzleSecurity, self.id, self.content);
+    hydratedUser.setProfile(new KuzzleProfile(self.kuzzleSecurity, response.result._id, response.result._source));
+
+    cb(null, hydratedUser);
   });
 };
 

test/security/kuzzleProfile/methods.test.js

@@ -183,8 +183,8 @@ describe('KuzzleRole methods', function () {
       kuzzle.query = queryStub;
       error = false;
 
-      result = { result: {_id: 'myProfile', _source: {roles : ['role1', 'role2']}} };
-      kuzzleProfile = new KuzzleProfile(kuzzle.security, result.result._id, result.result._source);
+      result = { result: {hits: [{_id: 'role1', _source: {indexes: {}}}, {_id: 'role2', _source: {indexes: {}}}]}};
+      kuzzleProfile = new KuzzleProfile(kuzzle.security, 'profile', {roles: result.result.hits});
       expectedQuery = {
         action: 'mGetRoles',
         controller: 'security'
@@ -196,11 +196,18 @@ describe('KuzzleRole methods', function () {
     });
 
     it('should send the right query to kuzzle', function (done) {
-      expectedQuery.body = {ids: result.result._source.roles};
+      expectedQuery.body = {ids: ['role1', 'role2']};
 
       should(kuzzleProfile.hydrate(function (err, res) {
         should(err).be.null();
         should(res).be.instanceof(KuzzleProfile);
+        should(res.content.roles).be.an.Array();
+        should(res.content.roles).not.be.empty();
+
+        res.content.roles.forEach(function (role) {
+          should(role).instanceof(KuzzleRole);
+        });
+
         done();
       }));
     });