feat: updated ui to reflect secret import and approval

backend/src/services/secret/secret-queue.ts

@@ -143,6 +143,18 @@ export const secretQueueFactory = ({
     });
   };
 
+  const replicateSecrets = async (dto: TSyncSecretsDTO) => {
+    await queueService.queue(QueueName.SecretReplication, QueueJobs.SecretReplication, dto, {
+      attempts: 3,
+      backoff: {
+        type: "exponential",
+        delay: 2000
+      },
+      removeOnComplete: true,
+      removeOnFail: true
+    });
+  };
+
   const removeSecretReminder = async (dto: TRemoveSecretReminderDTO) => {
     const appCfg = getConfig();
     await queueService.stopRepeatableJob(
@@ -361,22 +373,17 @@ export const secretQueueFactory = ({
       }
     );
     await syncIntegrations({ secretPath, projectId, environment });
-    if (!excludeReplication) {
-      await queueService.queue(
-        QueueName.SecretReplication,
-        QueueJobs.SecretReplication,
-        { environmentId, projectId, secretPath, folderId, secrets, membershipId },
-        {
-          attempts: 3,
-          backoff: {
-            type: "exponential",
-            delay: 2000
-          },
-          removeOnComplete: true,
-          removeOnFail: true
-        }
-      );
-    }
+    if (!excludeReplication)
+      await replicateSecrets({
+        environmentId,
+        projectId,
+        secretPath,
+        folderId,
+        secrets,
+        membershipId,
+        excludeReplication,
+        environmentSlug: environment
+      });
   });
 
   queueService.start(QueueName.IntegrationSync, async (job) => {
@@ -394,7 +401,8 @@ export const secretQueueFactory = ({
       const linkSourceDto = {
         projectId,
         importEnv: folder.environment.id,
-        importPath: secretPath
+        importPath: secretPath,
+        isReplication: false
       };
       const imports = await secretImportDAL.find(linkSourceDto);
 
@@ -598,6 +606,7 @@ export const secretQueueFactory = ({
     syncIntegrations,
     addSecretReminder,
     removeSecretReminder,
-    handleSecretReminder
+    handleSecretReminder,
+    replicateSecrets
   };
 };

backend/src/services/secret/secret-service.ts

@@ -550,7 +550,8 @@ export const secretServiceFactory = ({
 
     if (includeImports) {
       const secretImports = await secretImportDAL.findByFolderIds(paths.map((p) => p.folderId));
-      const allowedImports = secretImports.filter(({ importEnv, importPath }) =>
+      const allowedImports = secretImports.filter(({ importEnv, importPath, isReplication }) =>
+        !isReplication &&
         // if its service token allow full access over imported one
         actor === ActorType.SERVICE
           ? true
@@ -655,7 +656,7 @@ export const secretServiceFactory = ({
     // then search for imported secrets
     // here we consider the import order also thus starting from bottom
     if (!secret && includeImports) {
-      const secretImports = await secretImportDAL.find({ folderId });
+      const secretImports = await secretImportDAL.find({ folderId, isReplication: false });
       const allowedImports = secretImports.filter(({ importEnv, importPath }) =>
         // if its service token allow full access over imported one
         actor === ActorType.SERVICE

backend/src/services/secret/secret-types.ts

@@ -389,6 +389,8 @@ export type TSyncSecretsDTO<T extends boolean = false> = {
       environmentId: string;
       folderId: string;
       membershipId: string;
+      // used for import creation to trigger replication
+      pickOnlyImportIds?: string[];
       secrets: {
         operation: SecretOperations;
         id: string;