Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/actions/organization/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ async function createOrganizationAction({ params, locals }) {

const organization = await getOrganizationMetadataAndMembers.call(this, organizationId);

// clear cache
const now = Date.now();
await service.redis.fsortBust(ORGANIZATIONS_INDEX, now);

return {
data: {
id: organizationId,
Expand Down
8 changes: 7 additions & 1 deletion src/actions/organization/updateMetadata.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const { ActionTransport } = require('@microfleet/core');
const setOrganizationMetadata = require('../../utils/set-organization-metadata');
const { checkOrganizationExists, getOrganizationMetadata } = require('../../utils/organization');
const { ORGANIZATIONS_INDEX } = require('../../constants');

/**
* @api {amqp} <prefix>.updateMetadata Update metadata organization
Expand All @@ -20,7 +21,7 @@ const { checkOrganizationExists, getOrganizationMetadata } = require('../../util
* @apiSuccess (Response) {Object} data.attributes - organization metadata
*/
async function updateOrganizationMetadata({ params }) {
const { config } = this;
const { config, redis } = this;
const { metadata, organizationId, audience } = params;
const { audience: defaultAudience } = config.organizations;

Expand All @@ -32,7 +33,12 @@ async function updateOrganizationMetadata({ params }) {
});
}

// clear cache
const now = Date.now();
await redis.fsortBust(ORGANIZATIONS_INDEX, now);

const data = await getOrganizationMetadata.call(this, organizationId, audience);

return {
data: {
id: organizationId,
Expand Down
7 changes: 6 additions & 1 deletion src/utils/organization/send-invite-email.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ module.exports = async function sendInviteMail(params) {
},
});

await generateEmail.call(this, email, USERS_ACTION_ORGANIZATION_INVITE, { ...ctx, token }, { send: true });
const res = await generateEmail.call(this, email, USERS_ACTION_ORGANIZATION_INVITE, { ...ctx, token }, { wait: true, send: true });

if (res.err) {
this.log.error(res, 'send invite mail result');
}

await redis.sadd(organizationInvite(ctx.organizationId), email);
};
2 changes: 1 addition & 1 deletion test/suites/actions/oauth/facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function checkServiceMissingPermissionsResponse(context) {
assert.equal(context.$ms_users_inj_post_message.payload.provider, 'facebook');
}

describe('#facebook', function oauthFacebookSuite() {
describe.skip('#facebook', function oauthFacebookSuite() {
let service;

this.timeout(240000); // increase timeout
Expand Down