merge main

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

@@ -51,6 +51,7 @@ export type TServerConfig = {
   invalidatingCache: boolean;
   fipsEnabled: boolean;
   envOverrides?: Record<string, string>;
+  paramsFolderSecretDetectionEnabled: boolean;
 };
 
 export type TUpdateServerConfigDTO = {

frontend/src/hooks/api/appConnections/types/azure-app-configuration-connection.ts

@@ -2,15 +2,26 @@ import { AppConnection } from "@app/hooks/api/appConnections/enums";
 import { TRootAppConnection } from "@app/hooks/api/appConnections/types/root-connection";
 
 export enum AzureAppConfigurationConnectionMethod {
-  OAuth = "oauth"
+  OAuth = "oauth",
+  ClientSecret = "client-secret"
 }
 
 export type TAzureAppConfigurationConnection = TRootAppConnection & {
   app: AppConnection.AzureAppConfiguration;
-} & {
-  method: AzureAppConfigurationConnectionMethod.OAuth;
-  credentials: {
-    code: string;
-    tenantId?: string;
-  };
-};
+} & (
+    | {
+        method: AzureAppConfigurationConnectionMethod.OAuth;
+        credentials: {
+          code: string;
+          tenantId?: string;
+        };
+      }
+    | {
+        method: AzureAppConfigurationConnectionMethod.ClientSecret;
+        credentials: {
+          clientId: string;
+          clientSecret: string;
+          tenantId: string;
+        };
+      }
+  );

frontend/src/hooks/api/appConnections/types/azure-devops-connection.ts

@@ -3,7 +3,8 @@ import { TRootAppConnection } from "@app/hooks/api/appConnections/types/root-con
 
 export enum AzureDevOpsConnectionMethod {
   OAuth = "oauth",
-  AccessToken = "access-token"
+  AccessToken = "access-token",
+  ClientSecret = "client-secret"
 }
 
 export type TAzureDevOpsConnection = TRootAppConnection & {
@@ -24,4 +25,13 @@ export type TAzureDevOpsConnection = TRootAppConnection & {
           orgName: string;
         };
       }
+    | {
+        method: AzureDevOpsConnectionMethod.ClientSecret;
+        credentials: {
+          clientSecret: string;
+          tenantId: string;
+          clientId: string;
+          orgName: string;
+        };
+      }
   );

frontend/src/hooks/api/appConnections/types/azure-key-vault-connection.ts

@@ -2,13 +2,24 @@ import { AppConnection } from "@app/hooks/api/appConnections/enums";
 import { TRootAppConnection } from "@app/hooks/api/appConnections/types/root-connection";
 
 export enum AzureKeyVaultConnectionMethod {
-  OAuth = "oauth"
+  OAuth = "oauth",
+  ClientSecret = "client-secret"
 }
 
-export type TAzureKeyVaultConnection = TRootAppConnection & { app: AppConnection.AzureKeyVault } & {
-  method: AzureKeyVaultConnectionMethod.OAuth;
-  credentials: {
-    code: string;
-    tenantId?: string;
-  };
-};
+export type TAzureKeyVaultConnection = TRootAppConnection & { app: AppConnection.AzureKeyVault } & (
+    | {
+        method: AzureKeyVaultConnectionMethod.OAuth;
+        credentials: {
+          code: string;
+          tenantId?: string;
+        };
+      }
+    | {
+        method: AzureKeyVaultConnectionMethod.ClientSecret;
+        credentials: {
+          clientId: string;
+          clientSecret: string;
+          tenantId: string;
+        };
+      }
+  );

frontend/src/hooks/api/appConnections/types/github-connection.ts

@@ -11,6 +11,7 @@ export type TGitHubConnection = TRootAppConnection & { app: AppConnection.GitHub
         method: GitHubConnectionMethod.OAuth;
         credentials: {
           code: string;
+          host?: string;
         };
       }
     | {
@@ -18,6 +19,7 @@ export type TGitHubConnection = TRootAppConnection & { app: AppConnection.GitHub
         credentials: {
           code: string;
           installationId: string;
+          host?: string;
         };
       }
   );

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

@@ -281,7 +281,8 @@ export const useUpdateProject = () => {
       newProjectDescription,
       newSlug,
       secretSharing,
-      showSnapshotsLegacy
+      showSnapshotsLegacy,
+      secretDetectionIgnoreValues
     }) => {
       const { data } = await apiRequest.patch<{ workspace: Workspace }>(
         `/api/v1/workspace/${projectID}`,
@@ -290,7 +291,8 @@ export const useUpdateProject = () => {
           description: newProjectDescription,
           slug: newSlug,
           secretSharing,
-          showSnapshotsLegacy
+          showSnapshotsLegacy,
+          secretDetectionIgnoreValues
         }
       );
       return data.workspace;

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

@@ -40,6 +40,7 @@ export type Workspace = {
   hasDeleteProtection: boolean;
   secretSharing: boolean;
   showSnapshotsLegacy: boolean;
+  secretDetectionIgnoreValues: string[];
 };
 
 export type WorkspaceEnv = {
@@ -81,6 +82,7 @@ export type UpdateProjectDTO = {
   newSlug?: string;
   secretSharing?: boolean;
   showSnapshotsLegacy?: boolean;
+  secretDetectionIgnoreValues?: string[];
 };
 
 export type UpdatePitVersionLimitDTO = { projectSlug: string; pitVersionLimit: number };