Merge pull request #901 from kouponmedia/master

Assignable user and application IDs
ExpressGateway · Apr 11, 2019 · de96219 · de96219
2 parents d1a9487 + fbb57a1
commit de96219
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/services/consumers/application.service.js b/lib/services/consumers/application.service.js
@@ -175,7 +175,7 @@ function validateAndCreateApp (appProperties, userId) {
 
  const baseAppProps = { isActive: 'true', id: uuidv4(), userId };
 
- const app = Object.assign(appProperties, baseAppProps);
+ const app = Object.assign(baseAppProps, appProperties);
 
  utils.appendCreatedAt(app);
  utils.appendUpdatedAt(app);

diff --git a/lib/services/consumers/user.service.js b/lib/services/consumers/user.service.js
@@ -150,7 +150,7 @@ function validateAndCreateUser (_user) {
  .then(function (newUser) {
  const baseUserProps = { isActive: 'true', username: _user.username, id: uuidv4() };
  if (newUser) {
- user = Object.assign(newUser, baseUserProps);
+ user = Object.assign(baseUserProps, newUser);
  } else user = baseUserProps;
 
  utils.appendCreatedAt(user);

diff --git a/test/services/users.test.js b/test/services/users.test.js
@@ -224,6 +224,7 @@ describe('User service tests', () => {
  user = createRandomUserObject();
  return userService.insert(user);
  }).then(newUser => {
+ user = newUser; // update test user
  should.exist(newUser);
  user.id = newUser.id;
  }));