Skip to content

fix: edited generate password, send invite mail #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrRenat merged 2 commits into from
Jun 17, 2019
Merged

fix: edited generate password, send invite mail #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdfb5c9
fix: edited generate password, send invite mail
BrRenat Jun 17, 2019
399a448
fix: edit organization test
BrRenat Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ module.exports = exports = {

// invitations constants
INVITATIONS_INDEX: 'user-invitations',
ORGANIZATIONS_INVITATIONS_INDEX: 'organization-invitations',

// token
TOKEN_METADATA_FIELD_METADATA: '1',
Expand Down
1 change: 0 additions & 1 deletion src/utils/organization/addOrganizationMembers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ async function addOrganizationMembers(opts) {
}
});
await Promise.all(filterMembersJob);

const createdMembers = await registerOrganizationMembers.call(this, notRegisteredMembers);

const pipe = redis.pipeline();
Expand Down
4 changes: 2 additions & 2 deletions src/utils/organization/registerOrganizationMembers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/organization/sendInviteMail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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)));
};
6 changes: 3 additions & 3 deletions test/suites/organization/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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(),
Expand All @@ -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,
Expand Down