awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update refreshPlan to consider workspace

Browse Source
This commit is contained in:
Tuan Dang
2023-06-14 12:28:01 +01:00
parent 92647341a9
commit 82a026a426
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/controllers/v2/environmentController.ts
View File

@@ -8,6 +8,7 @@ import {
Membership,
} from '../../models';
import { SecretVersion } from '../../ee/models';
import { EELicenseService } from '../../ee/services';
import { BadRequestError } from '../../utils/errors';
import _ from 'lodash';
import { PERMISSION_READ_SECRETS, PERMISSION_WRITE_SECRETS } from '../../variables';
@@ -40,6 +41,8 @@ export const createWorkspaceEnvironment = async (
});
await workspace.save();
await EELicenseService.refreshPlan(workspace.organization.toString(), workspaceId);
return res.status(200).send({
message: 'Successfully created new environment',
workspace: workspaceId,
@@ -186,7 +189,9 @@ export const deleteWorkspaceEnvironment = async (
await Membership.updateMany(
{ workspace: workspaceId },
{ $pull: { deniedPermissions: { environmentSlug: environmentSlug } } }
)
);
await EELicenseService.refreshPlan(workspace.organization.toString(), workspaceId);
return res.status(200).send({
message: 'Successfully deleted environment',

4
backend/src/ee/services/EELicenseService.ts
View File

@@ -104,9 +104,9 @@ class EELicenseService {
return this.globalFeatureSet;
}
public async refreshOrganizationPlan(organizationId: string, workspaceId?: string) {
public async refreshPlan(organizationId: string, workspaceId?: string) {
if (this.instanceType === 'cloud') {
this.localFeatureSet.del(organizationId);
this.localFeatureSet.del(`${organizationId}-${workspaceId ?? ''}`);
await this.getPlan(organizationId, workspaceId);
}
}

2
backend/src/helpers/organization.ts
View File

@@ -170,7 +170,7 @@ export const updateSubscriptionOrgQuantity = async ({
);
}
await EELicenseService.refreshOrganizationPlan(organizationId);
await EELicenseService.refreshPlan(organizationId);
return stripeSubscription;
};

2
backend/src/helpers/workspace.ts
View File

@@ -41,7 +41,7 @@ export const createWorkspace = async ({
workspaceId: workspace._id
});
await EELicenseService.refreshOrganizationPlan(organizationId);
await EELicenseService.refreshPlan(organizationId);
return workspace;
};