From 41914e00271c8acf8e02ba3fca52e4dda954140f Mon Sep 17 00:00:00 2001 From: = Date: Fri, 31 May 2024 00:03:27 +0530 Subject: [PATCH] feat: switched to secretapproval check for license --- backend/src/ee/services/license/licence-fns.ts | 1 - backend/src/ee/services/license/license-types.ts | 1 - backend/src/services/secret-import/secret-import-service.ts | 4 ++-- frontend/src/hooks/api/subscriptions/types.ts | 1 - .../components/ActionBar/CreateSecretImportForm.tsx | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/src/ee/services/license/licence-fns.ts b/backend/src/ee/services/license/licence-fns.ts index 411882b25..189a3c4e0 100644 --- a/backend/src/ee/services/license/licence-fns.ts +++ b/backend/src/ee/services/license/licence-fns.ts @@ -16,7 +16,6 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ environmentLimit: null, environmentsUsed: 0, dynamicSecret: false, - secretReplication: false, secretVersioning: true, pitRecovery: false, ipAllowlisting: false, diff --git a/backend/src/ee/services/license/license-types.ts b/backend/src/ee/services/license/license-types.ts index f1ee6ab13..0c8fdc197 100644 --- a/backend/src/ee/services/license/license-types.ts +++ b/backend/src/ee/services/license/license-types.ts @@ -52,7 +52,6 @@ export type TFeatureSet = { has_used_trial: true; secretApproval: false; secretRotation: true; - secretReplication: false; }; export type TOrgPlansTableDTO = { diff --git a/backend/src/services/secret-import/secret-import-service.ts b/backend/src/services/secret-import/secret-import-service.ts index 83eaf2c90..31c057d99 100644 --- a/backend/src/services/secret-import/secret-import-service.ts +++ b/backend/src/services/secret-import/secret-import-service.ts @@ -86,7 +86,7 @@ export const secretImportServiceFactory = ({ ); if (isReplication) { const plan = await licenseService.getPlan(actorOrgId); - if (!plan.secretReplication) { + if (!plan.secretApproval) { throw new BadRequestError({ message: "Failed to create secret replication due to plan restriction. Upgrade plan to create replication." }); @@ -338,7 +338,7 @@ export const secretImportServiceFactory = ({ ); const plan = await licenseService.getPlan(actorOrgId); - if (!plan.secretReplication) { + if (!plan.secretApproval) { throw new BadRequestError({ message: "Failed to create secret replication due to plan restriction. Upgrade plan to create replication." }); diff --git a/frontend/src/hooks/api/subscriptions/types.ts b/frontend/src/hooks/api/subscriptions/types.ts index 4eb54cc11..45414292d 100644 --- a/frontend/src/hooks/api/subscriptions/types.ts +++ b/frontend/src/hooks/api/subscriptions/types.ts @@ -24,7 +24,6 @@ export type SubscriptionPlan = { scim: boolean; ldap: boolean; groups: boolean; - secretReplication: boolean; status: | "incomplete" | "incomplete_expired" diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx index 5832779e3..f579852a2 100644 --- a/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx +++ b/frontend/src/views/SecretMainPage/components/ActionBar/CreateSecretImportForm.tsx @@ -69,7 +69,7 @@ export const CreateSecretImportForm = ({ isReplication }: TFormSchema) => { try { - if (isReplication && !subscription?.secretReplication) { + if (isReplication && !subscription?.secretApproval) { onUpgradePlan(); return; }