Merge branch 'main' into feature/google-sign

frontend/src/hooks/api/secrets/index.ts

@@ -1 +1,6 @@
-export { useBatchSecretsOp, useGetProjectSecrets, useGetSecretVersion } from './queries';
+export {
+  useBatchSecretsOp,
+  useGetProjectSecrets,
+  useGetProjectSecretsByKey,
+  useGetSecretVersion
+} from './queries';

frontend/src/hooks/api/secrets/queries.tsx

@@ -19,7 +19,10 @@ import {
 
 export const secretKeys = {
   // this is also used in secretSnapshot part
-  getProjectSecret: (workspaceId: string, env: string | string[]) => [{ workspaceId, env }, 'secrets'],
+  getProjectSecret: (workspaceId: string, env: string | string[]) => [
+    { workspaceId, env },
+    'secrets'
+  ],
   getSecretVersion: (secretId: string) => [{ secretId }, 'secret-versions']
 };
 
@@ -32,11 +35,11 @@ const fetchProjectEncryptedSecrets = async (workspaceId: string, env: string | s
       }
     });
     return data.secrets;
-  }  
-  
+  }
+
   if (typeof env === 'object') {
     let allEnvData: any = [];
-    
+
     // eslint-disable-next-line no-restricted-syntax
     for (const envPoint of env) {
       // eslint-disable-next-line no-await-in-loop
@@ -48,13 +51,12 @@ const fetchProjectEncryptedSecrets = async (workspaceId: string, env: string | s
       });
       allEnvData = allEnvData.concat(data.secrets);
     }
-    
+
     return allEnvData;
-  // eslint-disable-next-line no-else-return
+    // eslint-disable-next-line no-else-return
   } else {
     return null;
   }
-
 };
 
 export const useGetProjectSecrets = ({
@@ -117,7 +119,10 @@ export const useGetProjectSecrets = ({
         };
 
         if (encSecret.type === 'personal') {
-          personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = { id: encSecret._id, value: secretValue };
+          personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = {
+            id: encSecret._id,
+            value: secretValue
+          };
         } else {
           if (!duplicateSecretKey?.[`${decryptedSecret.key}-${decryptedSecret.env}`]) {
             sharedSecrets.push(decryptedSecret);
@@ -126,17 +131,106 @@ export const useGetProjectSecrets = ({
         }
       });
       sharedSecrets.forEach((val) => {
-        if (personalSecrets?.[val.key]) {
-          val.idOverride = personalSecrets[val.key].id;
-          val.valueOverride = personalSecrets[val.key].value;
+        const dupKey = `${val.key}-${val.env}`;
+        if (personalSecrets?.[dupKey]) {
+          val.idOverride = personalSecrets[dupKey].id;
+          val.valueOverride = personalSecrets[dupKey].value;
           val.overrideAction = 'modified';
         }
       });
-
       return { secrets: sharedSecrets };
     }
   });
 
+export const useGetProjectSecretsByKey = ({
+  workspaceId,
+  env,
+  decryptFileKey,
+  isPaused
+}: GetProjectSecretsDTO) =>
+  useQuery({
+    // wait for all values to be available
+    enabled: Boolean(decryptFileKey && workspaceId && env) && !isPaused,
+    queryKey: secretKeys.getProjectSecret(workspaceId, env),
+    queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env),
+    select: (data) => {
+      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY') as string;
+      const latestKey = decryptFileKey;
+      const key = decryptAssymmetric({
+        ciphertext: latestKey.encryptedKey,
+        nonce: latestKey.nonce,
+        publicKey: latestKey.sender.publicKey,
+        privateKey: PRIVATE_KEY
+      });
+
+      const sharedSecrets: Record<string, DecryptedSecret[]> = {};
+      const personalSecrets: Record<string, { id: string; value: string }> = {};
+      // this used for add-only mode in dashboard
+      // type won't be there thus only one key is shown
+      const duplicateSecretKey: Record<string, boolean> = {};
+      const uniqSecKeys: Record<string, boolean> = {};
+      data.forEach((encSecret: EncryptedSecret) => {
+        const secretKey = decryptSymmetric({
+          ciphertext: encSecret.secretKeyCiphertext,
+          iv: encSecret.secretKeyIV,
+          tag: encSecret.secretKeyTag,
+          key
+        });
+        if (!uniqSecKeys?.[secretKey]) uniqSecKeys[secretKey] = true;
+
+        const secretValue = decryptSymmetric({
+          ciphertext: encSecret.secretValueCiphertext,
+          iv: encSecret.secretValueIV,
+          tag: encSecret.secretValueTag,
+          key
+        });
+
+        const secretComment = decryptSymmetric({
+          ciphertext: encSecret.secretCommentCiphertext,
+          iv: encSecret.secretCommentIV,
+          tag: encSecret.secretCommentTag,
+          key
+        });
+
+        const decryptedSecret = {
+          _id: encSecret._id,
+          env: encSecret.environment,
+          key: secretKey,
+          value: secretValue,
+          tags: encSecret.tags,
+          comment: secretComment,
+          createdAt: encSecret.createdAt,
+          updatedAt: encSecret.updatedAt
+        };
+
+        if (encSecret.type === 'personal') {
+          personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = {
+            id: encSecret._id,
+            value: secretValue
+          };
+        } else {
+          if (!duplicateSecretKey?.[`${decryptedSecret.key}-${decryptedSecret.env}`]) {
+            if (!sharedSecrets?.[secretKey]) sharedSecrets[secretKey] = [];
+            sharedSecrets[secretKey].push(decryptedSecret);
+          }
+          duplicateSecretKey[`${decryptedSecret.key}-${decryptedSecret.env}`] = true;
+        }
+      });
+      Object.keys(sharedSecrets).forEach((secName) => {
+        sharedSecrets[secName].forEach((val) => {
+          const dupKey = `${val.key}-${val.env}`;
+          if (personalSecrets?.[dupKey]) {
+            val.idOverride = personalSecrets[dupKey].id;
+            val.valueOverride = personalSecrets[dupKey].value;
+            val.overrideAction = 'modified';
+          }
+        });
+      });
+
+      return { secrets: sharedSecrets, uniqueSecCount: Object.keys(uniqSecKeys).length };
+    }
+  });
+
 const fetchEncryptedSecretVersion = async (secretId: string, offset: number, limit: number) => {
   const { data } = await apiRequest.get<{ secretVersions: EncryptedSecretVersion[] }>(
     `/api/v1/secret/${secretId}/secret-versions`,

frontend/src/hooks/api/secrets/types.ts

@@ -62,6 +62,7 @@ type SecretTagArg = { _id: string; name: string; slug: string };
 export type UpdateSecretArg = {
   _id: string;
   type: 'shared' | 'personal';
+  secretName: string;
   secretKeyCiphertext: string;
   secretKeyIV: string;
   secretKeyTag: string;