fix: edited generate password, send invite mail (#407)

Author: BrRenat

src/constants.js

@@ -89,6 +89,7 @@ module.exports = exports = {
 
   // invitations constants
   INVITATIONS_INDEX: 'user-invitations',
+  ORGANIZATIONS_INVITATIONS_INDEX: 'organization-invitations',
 
   // token
   TOKEN_METADATA_FIELD_METADATA: '1',

src/utils/organization/addOrganizationMembers.js

@@ -36,7 +36,6 @@ async function addOrganizationMembers(opts) {
     }
   });
   await Promise.all(filterMembersJob);
-
   const createdMembers = await registerOrganizationMembers.call(this, notRegisteredMembers);
 
   const pipe = redis.pipeline();

src/utils/organization/registerOrganizationMembers.js

@@ -13,7 +13,7 @@ const {
   USERS_INDEX,
   USERS_ID_FIELD,
 } = require('../../constants.js');
-const hashPassword = require('../register/password/hash');
+const scrypt = require('../scrypt');
 const setMetadata = require('../updateMetadata');
 
 async function registerOrganizationMember(member) {
@@ -29,7 +29,7 @@ async function registerOrganizationMember(member) {
     [USERS_ACTIVE_FLAG]: true,
   };
   const password = generatePassword(pwdReset.length, pwdReset.memorable);
-  basicInfo[USERS_PASSWORD_FIELD] = await hashPassword.call(this, password);
+  basicInfo[USERS_PASSWORD_FIELD] = await scrypt.hash(password);
 
   const userDataKey = redisKey(userId, USERS_DATA);
   pipeline.hmset(userDataKey, basicInfo);

src/utils/organization/sendInviteMail.js

@@ -1,7 +1,7 @@
 const Promise = require('bluebird');
 const generateEmail = require('../challenges/email/generate.js');
 const {
-  INVITATIONS_INDEX,
+  ORGANIZATIONS_INVITATIONS_INDEX,
   TOKEN_METADATA_FIELD_CONTEXT,
   TOKEN_METADATA_FIELD_SENDED_AT,
 } = require('../../constants.js');
@@ -24,5 +24,5 @@ module.exports = function sendInviteMail(params) {
     .then(token => Promise
       .bind(this, [email, action, { ...ctx, token }, { send: true }])
       .spread(generateEmail)
-      .tap(() => redis.sadd(INVITATIONS_INDEX, email)));
+      .tap(() => redis.sadd(ORGANIZATIONS_INVITATIONS_INDEX, email)));
 };

test/suites/organization/create.js

@@ -4,7 +4,7 @@ const assert = require('assert');
 const sinon = require('sinon');
 const faker = require('faker');
 const { createMembers, createOrganization } = require('../../helpers/organization');
-const hashPassword = require('../../../src/utils/register/password/hash');
+const scrypt = require('../../../src/utils/scrypt');
 const registerOrganizationMembers = require('../../../src/utils/organization/registerOrganizationMembers');
 
 describe('#create organization', function registerSuite() {
@@ -26,7 +26,7 @@ describe('#create organization', function registerSuite() {
 
   it('must be able to create organization and register user', async function test() {
     const sendInviteMailSpy = sinon.spy(registerOrganizationMembers, 'call');
-    const generatePasswordSpy = sinon.spy(hashPassword, 'call');
+    const generatePasswordSpy = sinon.spy(scrypt, 'hash');
 
     const params = {
       name: faker.company.companyName(),
@@ -49,7 +49,7 @@ describe('#create organization', function registerSuite() {
       });
 
     const [registeredMember] = await sendInviteMailSpy.returnValues[0];
-    const registeredMemberPassword = generatePasswordSpy.firstCall.args[1];
+    const registeredMemberPassword = generatePasswordSpy.firstCall.args[0];
     const loginParams = {
       username: registeredMember.email,
       password: registeredMemberPassword,