fix: edited send organization invite mail (#404)

* feat: edited send organization invite mail

* fix: added handling new action

* fix: edited checking organization invite

* fix: return config

* fix: code refactor

* fix: fix lint error

Author: BrRenat

src/actions/organization/invites/accept.js

@@ -3,7 +3,7 @@ const { checkOrganizationExists } = require('../../../utils/organization');
 const {
   ErrorUserNotMember,
   ORGANIZATIONS_MEMBERS,
-  USERS_ACTION_INVITE,
+  USERS_ACTION_ORGANIZATION_INVITE,
   ErrorInvitationExpiredOrUsed,
 } = require('../../../constants');
 const redisKey = require('../../../utils/key.js');
@@ -16,7 +16,7 @@ async function verifyToken(tokenManager, params) {
   // we must ensure that token matches supplied ID
   // it can be overwritten by sending `anyUsername: true`
   const control = {
-    action: USERS_ACTION_INVITE,
+    action: USERS_ACTION_ORGANIZATION_INVITE,
     id: params.username,
   };
 

src/actions/organization/invites/send.js

@@ -1,8 +1,9 @@
 const { ActionTransport } = require('@microfleet/core');
-const generateInvite = require('../../invite');
+const sendInviteMail = require('../../../utils/organization/sendInviteMail');
+const getInternalData = require('../../../utils/organization/getInternalData');
 const redisKey = require('../../../utils/key');
 const { checkOrganizationExists } = require('../../../utils/organization');
-const { ORGANIZATIONS_MEMBERS, ErrorUserNotMember } = require('../../../constants');
+const { ORGANIZATIONS_MEMBERS, ErrorUserNotMember, ORGANIZATIONS_NAME_FIELD } = require('../../../constants');
 
 /**
  * @api {amqp} <prefix>.invites.send Send invitation
@@ -29,11 +30,16 @@ async function sendOrganizationInvite({ params }) {
   if (!userInOrganization) {
     throw ErrorUserNotMember;
   }
+  const organization = await getInternalData.call(this, organizationId, false);
 
-  return generateInvite.call(this, { params: {
+  return sendInviteMail.call(this, {
     email: member.email,
-    ctx: { firstName: member.firstName, lastName: member.lastName },
-  } });
+    ctx: {
+      firstName: member.firstName,
+      lastName: member.lastName,
+      organization: organization[ORGANIZATIONS_NAME_FIELD],
+    },
+  });
 }
 
 sendOrganizationInvite.allowed = checkOrganizationExists;

src/constants.js

@@ -84,6 +84,7 @@ module.exports = exports = {
   USERS_ACTION_RESET: 'reset',
   USERS_ACTION_REGISTER: 'register',
   USERS_ACTION_INVITE: 'invite',
+  USERS_ACTION_ORGANIZATION_INVITE: 'organization-invite',
 
   // invitations constants
   INVITATIONS_INDEX: 'user-invitations',

src/utils/challenges/email/generate.js

@@ -13,6 +13,7 @@ const {
   USERS_ACTION_PASSWORD,
   USERS_ACTION_REGISTER,
   USERS_ACTION_INVITE,
+  USERS_ACTION_ORGANIZATION_INVITE,
 } = require('../../../constants.js');
 
 // will be replaced later
@@ -33,6 +34,7 @@ function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
     case USERS_ACTION_ACTIVATE:
     case USERS_ACTION_RESET:
     case USERS_ACTION_INVITE:
+    case USERS_ACTION_ORGANIZATION_INVITE:
       // generate secret
       context.qs = `?q=${context.token.secret}`;
       context.link = generateLink(server, paths[type]);

src/utils/organization/addOrganizationMembers.js

@@ -1,9 +1,10 @@
 /* eslint-disable no-mixed-operators */
 const Promise = require('bluebird');
 const redisKey = require('../key.js');
-const generateInvite = require('../../actions/invite');
+const sendInviteMail = require('./sendInviteMail');
+const getInternalData = require('./getInternalData');
 const handlePipeline = require('../pipelineError.js');
-const { ORGANIZATIONS_MEMBERS, USERS_ORGANIZATIONS } = require('../../constants.js');
+const { ORGANIZATIONS_MEMBERS, USERS_ORGANIZATIONS, ORGANIZATIONS_NAME_FIELD } = require('../../constants.js');
 
 /**
  * Updates metadata on a organization object
@@ -29,14 +30,19 @@ async function addOrganizationMembers(opts) {
   });
 
   await pipe.exec().then(handlePipeline);
+  const organization = await getInternalData.call(this, organizationId, false);
 
   const membersIdsJob = [];
   for (const member of members) {
     membersIdsJob.push(
-      generateInvite.call(this, { params: {
+      sendInviteMail.call(this, {
         email: member.email,
-        ctx: { firstName: member.firstName, lastName: member.lastName },
-      } })
+        ctx: {
+          firstName: member.firstName,
+          lastName: member.lastName,
+          organization: organization[ORGANIZATIONS_NAME_FIELD],
+        },
+      })
     );
   }
 

src/utils/organization/sendInviteMail.js

@@ -0,0 +1,29 @@
+const Promise = require('bluebird');
+const generateEmail = require('../challenges/email/generate.js');
+const {
+  INVITATIONS_INDEX,
+  TOKEN_METADATA_FIELD_CONTEXT,
+  TOKEN_METADATA_FIELD_SENDED_AT,
+  USERS_ACTION_ORGANIZATION_INVITE,
+} = require('../../constants.js');
+
+module.exports = function sendInviteMail(params) {
+  const { redis, tokenManager } = this;
+  const { email, ctx = {} } = params;
+  const now = Date.now();
+
+  return tokenManager
+    .create({
+      id: email,
+      action: USERS_ACTION_ORGANIZATION_INVITE,
+      regenerate: true,
+      metadata: {
+        [TOKEN_METADATA_FIELD_CONTEXT]: ctx,
+        [TOKEN_METADATA_FIELD_SENDED_AT]: now,
+      },
+    })
+    .then(token => Promise
+      .bind(this, [email, USERS_ACTION_ORGANIZATION_INVITE, { ...ctx, token }, { send: true }])
+      .spread(generateEmail)
+      .tap(() => redis.sadd(INVITATIONS_INDEX, email)));
+};

test/configs/core.js

@@ -9,6 +9,7 @@ module.exports = {
       password: 'cpst-password',
       register: 'cpst-register',
       invite: 'rfx-invite',
+      'organization-invite': 'sl-accept-invite',
     },
   },
   registrationLimits: {

yarn.lock

@@ -1200,11 +1200,16 @@ bluebird-retry@^0.11.0:
   resolved "https://registry.yarnpkg.com/bluebird-retry/-/bluebird-retry-0.11.0.tgz#1289ab22cbbc3a02587baad35595351dd0c1c047"
   integrity sha1-EomrIsu8OgJYe6rTVZU1HdDBwEc=
 
-bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.4:
+bluebird@^3.5.0, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
   integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
+bluebird@^3.5.1:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -5248,9 +5253,9 @@ ms-mailer-client@^8.0.1:
     lodash.merge "^4.6.1"
 
 ms-mailer-templates@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/ms-mailer-templates/-/ms-mailer-templates-1.11.1.tgz#e92ff0c88277aaa2558070eadae7163e7ff8a98f"
-  integrity sha512-IS1yWrQp0X4M7bN21P1aMA/G6qKI8l6g5+mnhufgSuLHPi0Paehff8GVxnh573oaHA2D37SKH9Y4j0glc+9yGw==
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/ms-mailer-templates/-/ms-mailer-templates-1.13.1.tgz#29de47138f68633a3fc596fe99f86ffbe578bb89"
+  integrity sha512-LIVP1aolT7fefp/6lefDr2Xak2Uah+OLD53LBq75kU9Y7kBNDAIWmAs5Evsp5U84xJAGCC+yz29FkHAUGR+Ybg==
   dependencies:
     bluebird "^3.5.1"
     common-errors "^1.0.5"
@@ -5360,9 +5365,9 @@ needle@^2.2.1:
     sax "^1.2.4"
 
 neo-async@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
 nerf-dart@^1.0.0:
   version "1.0.0"
@@ -8025,9 +8030,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@^3.1.4:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.6.tgz#8a5f8a06ee7415ac1fa302f4623bc7344b553da4"
-  integrity sha512-YDKRX8F0Y+Jr7LhoVk0n4G7ltR3Y7qFAj+DtVBthlOgCcIj1hyMigCfousVfn9HKmvJ+qiFlLDwaHx44/e5ZKw==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
   dependencies:
     commander "~2.20.0"
     source-map "~0.6.1"