21 Adapations to createUser method + tests

Author: samniisan

src/security/Security.js

@@ -509,13 +509,25 @@ Security.prototype.createUser = function (id, content, options, cb) {
     options = null;
   }
 
-  if (options) {
-    action = options.replaceIfExist ? 'createOrReplaceUser' : 'createUser';
-  }
+  if (options && options.hasOwnProperty('replaceIfExist')) {
+    self.fetchUser(id, function (fetchError, fetchResult) {
+      if (fetchResult instanceof User) {
+        if (options.replaceIfExist !== true) {
+          return cb(new Error('Security.createUser: User was found and shouldn\'t be replaced'));
+        }
+        action = 'replaceUser';
+      }
 
-  self.kuzzle.query(this.buildQueryArgs(action), data, null, cb && function (err, res) {
-    cb(err, err ? undefined : new User(self, res.result._id, res.result._source));
-  });
+      self.kuzzle.query(self.buildQueryArgs(action), data, null, cb && function (err, res) {
+        cb(err, err ? undefined : new User(self, res.result._id, res.result._source));
+      });
+    });
+  }
+  else {
+    self.kuzzle.query(self.buildQueryArgs(action), data, null, cb && function (err, res) {
+      cb(err, err ? undefined : new User(self, res.result._id, res.result._source));
+    });
+  }
 };
 
 /**

test/security/kuzzleSecurity/userMethods.test.js

@@ -1,5 +1,6 @@
 var
   should = require('should'),
+  sinon = require('sinon'),
   Kuzzle = require('../../../src/Kuzzle'),
   User = require('../../../src/security/User');
 
@@ -223,12 +224,52 @@ describe('Security user methods', function () {
       done();
     });
 
-    it('should construct a createOrReplaceUser action if option replaceIfExist is set to true', function (done) {
-      expectedQuery.body = result.result._source;
+    it('should construct a replaceUser action if option replaceIfExist is set to true', function (done) {
+      var spy;
+
+      expectedQuery.body = [{}, result.result._source];
       expectedQuery._id = result.result._id;
-      expectedQuery.action = 'createOrReplaceUser';
+
+      kuzzle.query = function (args, query, options, cb) {
+        should(args.controller).be.exactly(expectedQuery.controller);
+
+        if (expectedQuery.options) {
+          should(options).match(expectedQuery.options);
+        }
+
+        if (expectedQuery.body) {
+          if (!query.body) {
+            query.body = {};
+          }
+
+          should(expectedQuery.body).containEql(query.body);
+        } else {
+          should(query.body).be.undefined();
+        }
+
+        if (expectedQuery._id) {
+          should(query._id).be.exactly(expectedQuery._id);
+        }
+
+        if (cb) {
+          if (error) {
+            return cb(error);
+          }
+
+          cb(error, result);
+        }
+      };
+      spy = sinon.spy(kuzzle, 'query');
 
       should(kuzzle.security.createUser(result.result._id, result.result._source, {replaceIfExist: true}, function (err, res) {
+        should(spy).be.calledTwice();
+
+        should(spy.getCall(0).args[0].action).be.exactly('getUser');
+        should(spy.getCall(0).args[1]).deepEqual({_id: 'foobar', body: {}});
+
+        should(spy.getCall(1).args[0].action).be.exactly('replaceUser');
+        should(spy.getCall(1).args[1]).deepEqual({_id: 'foobar', body: {profileIds: ['myProfile']}});
+
         should(err).be.null();
         should(res).be.instanceof(User);
         done();