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

Update getPlan with workspace-specific consideration and add environmentLimit to returned plan

Browse Source
This commit is contained in:
Tuan Dang
2023-06-14 11:52:48 +01:00
parent 776cecc3ef
commit 92647341a9
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/v1/membershipOrgController.ts
+1 -1
View File
@@ -99,7 +99,7 @@ export const inviteUserToOrganization = async (req: Request, res: Response) => {
throw new Error('Failed to validate organization membership'); throw new Error('Failed to validate organization membership');
} }
const plan = await EELicenseService.getOrganizationPlan(organizationId); const plan = await EELicenseService.getPlan(organizationId);
if (plan.memberLimit !== null) { if (plan.memberLimit !== null) {
// case: limit imposed on number of members allowed // case: limit imposed on number of members allowed
backend/src/controllers/v1/workspaceController.ts
+1 -1
View File
@@ -116,7 +116,7 @@ export const createWorkspace = async (req: Request, res: Response) => {
throw new Error("Failed to validate organization membership"); throw new Error("Failed to validate organization membership");
} }
const plan = await EELicenseService.getOrganizationPlan(organizationId); const plan = await EELicenseService.getPlan(organizationId);
if (plan.workspaceLimit !== null) { if (plan.workspaceLimit !== null) {
// case: limit imposed on number of workspaces allowed // case: limit imposed on number of workspaces allowed
backend/src/ee/controllers/v1/organizationsController.ts
+2 -1
View File
@@ -8,8 +8,9 @@ import { EELicenseService } from '../../services';
*/ */
export const getOrganizationPlan = async (req: Request, res: Response) => { export const getOrganizationPlan = async (req: Request, res: Response) => {
const { organizationId } = req.params; const { organizationId } = req.params;
const workspaceId = req.query.workspaceId as string;
const plan = await EELicenseService.getOrganizationPlan(organizationId); const plan = await EELicenseService.getPlan(organizationId, workspaceId);
return res.status(200).send({ return res.status(200).send({
plan, plan,
backend/src/ee/routes/v1/organizations.ts
+2 -1
View File
@@ -5,7 +5,7 @@ import {
requireOrganizationAuth, requireOrganizationAuth,
validateRequest validateRequest
} from '../../../middleware'; } from '../../../middleware';
import { param, body } from 'express-validator'; import { param, body, query } from 'express-validator';
import { organizationsController } from '../../controllers/v1'; import { organizationsController } from '../../controllers/v1';
import { import {
OWNER, ADMIN, MEMBER, ACCEPTED OWNER, ADMIN, MEMBER, ACCEPTED
@@ -21,6 +21,7 @@ router.get(
acceptedStatuses: [ACCEPTED] acceptedStatuses: [ACCEPTED]
}), }),
param('organizationId').exists().trim(), param('organizationId').exists().trim(),
query('workspaceId').optional().isString(),
validateRequest, validateRequest,
organizationsController.getOrganizationPlan organizationsController.getOrganizationPlan
); );
backend/src/ee/services/EELicenseService.ts
+16 -8
View File
@@ -22,6 +22,8 @@ interface FeatureSet {
workspacesUsed: number; workspacesUsed: number;
memberLimit: number | null; memberLimit: number | null;
membersUsed: number; membersUsed: number;
environmentLimit: number | null;
environmentsUsed: number;
secretVersioning: boolean; secretVersioning: boolean;
pitRecovery: boolean; pitRecovery: boolean;
rbac: boolean; rbac: boolean;
@@ -51,6 +53,8 @@ class EELicenseService {
workspacesUsed: 0, workspacesUsed: 0,
memberLimit: null, memberLimit: null,
membersUsed: 0, membersUsed: 0,
environmentLimit: null,
environmentsUsed: 0,
secretVersioning: true, secretVersioning: true,
pitRecovery: true, pitRecovery: true,
rbac: true, rbac: true,
@@ -69,10 +73,10 @@ class EELicenseService {
}); });
} }
public async getOrganizationPlan(organizationId: string): Promise<FeatureSet> { public async getPlan(organizationId: string, workspaceId?: string): Promise<FeatureSet> {
try { try {
if (this.instanceType === 'cloud') { if (this.instanceType === 'cloud') {
const cachedPlan = this.localFeatureSet.get<FeatureSet>(organizationId); const cachedPlan = this.localFeatureSet.get<FeatureSet>(`${organizationId}-${workspaceId ?? ''}`);
if (cachedPlan) { if (cachedPlan) {
return cachedPlan; return cachedPlan;
} }
@@ -80,12 +84,16 @@ class EELicenseService {
const organization = await Organization.findById(organizationId); const organization = await Organization.findById(organizationId);
if (!organization) throw OrganizationNotFoundError(); if (!organization) throw OrganizationNotFoundError();
const { data: { currentPlan } } = await licenseServerKeyRequest.get( let url = `${await getLicenseServerUrl()}/api/license-server/v1/customers/${organization.customerId}/cloud-plan`;
`${await getLicenseServerUrl()}/api/license-server/v1/customers/${organization.customerId}/cloud-plan`
); if (workspaceId) {
url += `?workspaceId=${workspaceId}`;
}
const { data: { currentPlan } } = await licenseServerKeyRequest.get(url);
// cache fetched plan for organization // cache fetched plan for organization
this.localFeatureSet.set(organizationId, currentPlan); this.localFeatureSet.set(`${organizationId}-${workspaceId ?? ''}`, currentPlan);
return currentPlan; return currentPlan;
} }
@@ -96,10 +104,10 @@ class EELicenseService {
return this.globalFeatureSet; return this.globalFeatureSet;
} }
public async refreshOrganizationPlan(organizationId: string) { public async refreshOrganizationPlan(organizationId: string, workspaceId?: string) {
if (this.instanceType === 'cloud') { if (this.instanceType === 'cloud') {
this.localFeatureSet.del(organizationId); this.localFeatureSet.del(organizationId);
await this.getOrganizationPlan(organizationId); await this.getPlan(organizationId, workspaceId);
} }
} }