Merge remote-tracking branch 'origin/main' into feat/add-version-limits

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

@@ -7,6 +7,7 @@ export type IntegrationAuth = {
   updatedAt: string;
   algorithm: string;
   keyEncoding: string;
+  url?: string;
   teamId?: string;
 };
 

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

@@ -41,6 +41,7 @@ export const useCreateIntegration = () => {
       owner,
       path,
       region,
+      url,
       scope,
       secretPath,
       metadata
@@ -56,6 +57,7 @@ export const useCreateIntegration = () => {
       targetService?: string;
       targetServiceId?: string;
       owner?: string;
+      url?: string;
       path?: string;
       region?: string;
       scope?: string;
@@ -85,6 +87,7 @@ export const useCreateIntegration = () => {
         targetEnvironmentId,
         targetService,
         targetServiceId,
+        url,
         owner,
         path,
         scope,

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

@@ -220,6 +220,7 @@ export const useGetSecretApprovalRequestCount = ({
 }) =>
   useQuery({
     queryKey: secretApprovalRequestKeys.count({ workspaceId }),
+    refetchInterval: 5000,
     queryFn: () => fetchSecretApprovalRequestCount({ workspaceId }),
     enabled: Boolean(workspaceId) && (options?.enabled ?? true)
   });

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

@@ -44,6 +44,7 @@ export type TSecretApprovalSecChange = {
 
 export type TSecretApprovalRequest<J extends unknown = EncryptedSecret> = {
   id: string;
+  isReplicated?: boolean;
   slug: string;
   createdAt: string;
   committerId: string;

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

@@ -1,3 +1,7 @@
+export enum ReservedFolders {
+  SecretReplication = "__reserve_replication_"
+}
+
 export type TSecretFolder = {
   id: string;
   name: string;

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

@@ -1,4 +1,9 @@
-export { useCreateSecretImport, useDeleteSecretImport, useUpdateSecretImport } from "./mutation";
+export {
+  useCreateSecretImport,
+  useDeleteSecretImport,
+  useResyncSecretReplication,
+  useUpdateSecretImport
+} from "./mutation";
 export {
   useGetImportedFoldersByEnv,
   useGetImportedSecretsAllEnvs,

frontend/src/hooks/api/secretImports/mutation.tsx

@@ -3,18 +3,24 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { apiRequest } from "@app/config/request";
 
 import { secretImportKeys } from "./queries";
-import { TCreateSecretImportDTO, TDeleteSecretImportDTO, TUpdateSecretImportDTO } from "./types";
+import {
+  TCreateSecretImportDTO,
+  TDeleteSecretImportDTO,
+  TResyncSecretReplicationDTO,
+  TUpdateSecretImportDTO
+} from "./types";
 
 export const useCreateSecretImport = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, TCreateSecretImportDTO>({
-    mutationFn: async ({ import: secretImport, environment, projectId, path }) => {
+    mutationFn: async ({ import: secretImport, environment, isReplication, projectId, path }) => {
       const { data } = await apiRequest.post("/api/v1/secret-imports", {
         import: secretImport,
         environment,
         workspaceId: projectId,
-        path
+        path,
+        isReplication
       });
       return data;
     },
@@ -53,6 +59,19 @@ export const useUpdateSecretImport = () => {
   });
 };
 
+export const useResyncSecretReplication = () => {
+  return useMutation<{}, {}, TResyncSecretReplicationDTO>({
+    mutationFn: async ({ environment, projectId, path, id }) => {
+      const { data } = await apiRequest.post(`/api/v1/secret-imports/${id}/replication-resync`, {
+        environment,
+        path,
+        workspaceId: projectId
+      });
+      return data;
+    }
+  });
+};
+
 export const useDeleteSecretImport = () => {
   const queryClient = useQueryClient();
 

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

@@ -10,6 +10,11 @@ export type TSecretImport = {
   position: string;
   createdAt: string;
   updatedAt: string;
+  isReserved?: boolean;
+  isReplication?: boolean;
+  isReplicationSuccess?: boolean;
+  replicationStatus?: string;
+  lastReplicated?: string;
 };
 
 export type TGetImportedFoldersByEnvDTO = {
@@ -60,6 +65,7 @@ export type TCreateSecretImportDTO = {
     environment: string;
     path: string;
   };
+  isReplication?: boolean;
 };
 
 export type TUpdateSecretImportDTO = {
@@ -74,6 +80,13 @@ export type TUpdateSecretImportDTO = {
   }>;
 };
 
+export type TResyncSecretReplicationDTO = {
+  id: string;
+  projectId: string;
+  environment: string;
+  path?: string;
+};
+
 export type TDeleteSecretImportDTO = {
   id: string;
   projectId: string;

frontend/src/hooks/api/secretSharing/queries.ts

@@ -8,9 +8,7 @@ export const useGetSharedSecrets = () => {
   return useQuery({
     queryKey: ["sharedSecrets"],
     queryFn: async () => {
-      const { data } = await apiRequest.get<TSharedSecret[]>(
-        "/api/v1/secret-sharing/"
-      );
+      const { data } = await apiRequest.get<TSharedSecret[]>("/api/v1/secret-sharing/");
       return data;
     }
   });
@@ -23,11 +21,9 @@ export const useGetActiveSharedSecretByIdAndHashedHex = (id: string, hashedHex:
         `/api/v1/secret-sharing/public/${id}?hashedHex=${hashedHex}`
       );
       return {
-        name: data.name,
         encryptedValue: data.encryptedValue,
         iv: data.iv,
         tag: data.tag,
-        expiresAt: data.expiresAt
       };
     }
   });

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

@@ -1,31 +1,24 @@
 export type TSharedSecret = {
   id: string;
-  name: string;
-  encryptedValue: string;
-  iv: string;
-  tag: string;
-  hashedHex: string;
   userId: string;
-  expiresAt: Date;
+  orgId: string;
   createdAt: Date;
   updatedAt: Date;
-};
+} & TCreateSharedSecretRequest;
 
 export type TCreateSharedSecretRequest = {
-  name: string;
   encryptedValue: string;
   iv: string;
   tag: string;
   hashedHex: string;
   expiresAt: Date;
+  expiresAfterViews: number;
 };
 
 export type TViewSharedSecretResponse = {
-  name: string;
   encryptedValue: string;
   iv: string;
   tag: string;
-  expiresAt: Date;
 };
 
 export type TDeleteSharedSecretRequest = {