Merge branch 'main' into feature/slack-secret-sync-error-notification

backend/src/db/migrations/20251106172316_delete-pki-templates-on-project-removal.ts

@@ -0,0 +1,21 @@
+import { Knex } from "knex";
+
+import { TableName } from "../schemas";
+
+export async function up(knex: Knex): Promise<void> {
+  if (await knex.schema.hasTable(TableName.PkiCertificateTemplateV2)) {
+    await knex.schema.alterTable(TableName.PkiCertificateTemplateV2, (t) => {
+      t.dropForeign(["projectId"]);
+      t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
+    });
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  if (await knex.schema.hasTable(TableName.PkiCertificateTemplateV2)) {
+    await knex.schema.alterTable(TableName.PkiCertificateTemplateV2, (t) => {
+      t.dropForeign(["projectId"]);
+      t.foreign("projectId").references("id").inTable(TableName.Project);
+    });
+  }
+}

backend/src/ee/routes/v1/app-connection-routers/chef-connection-router.ts

@@ -1,17 +1,16 @@
 import z from "zod";
 
-import { readLimit } from "@app/server/config/rateLimiter";
-import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
-import { AppConnection } from "@app/services/app-connection/app-connection-enums";
 import {
   CreateChefConnectionSchema,
   SanitizedChefConnectionSchema,
   UpdateChefConnectionSchema
-} from "@app/services/app-connection/chef";
+} from "@app/ee/services/app-connections/chef";
+import { readLimit } from "@app/server/config/rateLimiter";
+import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
+import { registerAppConnectionEndpoints } from "@app/server/routes/v1/app-connection-routers/app-connection-endpoints";
+import { AppConnection } from "@app/services/app-connection/app-connection-enums";
 import { AuthMode } from "@app/services/auth/auth-type";
 
-import { registerAppConnectionEndpoints } from "./app-connection-endpoints";
-
 export const registerChefConnectionRouter = async (server: FastifyZodProvider) => {
   registerAppConnectionEndpoints({
     app: AppConnection.Chef,

backend/src/ee/routes/v1/pam-account-routers/pam-account-router.ts

@@ -92,7 +92,8 @@ export const registerPamAccountRouter = async (server: FastifyZodProvider) => {
           gatewayClientCertificate: z.string(),
           gatewayClientPrivateKey: z.string(),
           gatewayServerCertificateChain: z.string(),
-          relayHost: z.string()
+          relayHost: z.string(),
+          metadata: z.record(z.string(), z.string()).optional()
         })
       }
     },

backend/src/ee/routes/v1/pit-router.ts

@@ -468,7 +468,10 @@ export const registerPITRouter = async (server: FastifyZodProvider) => {
                     .transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim()))
                     .optional(),
                   secretComment: z.string().trim().optional().default(""),
-                  skipMultilineEncoding: z.boolean().optional(),
+                  skipMultilineEncoding: z
+                    .boolean()
+                    .nullish()
+                    .transform((val) => (val === null ? false : val)),
                   metadata: z.record(z.string()).optional(),
                   secretMetadata: ResourceMetadataSchema.optional(),
                   tagIds: z.string().array().optional()

backend/src/ee/routes/v1/secret-sync-routers/chef-sync-router.ts

@@ -1,8 +1,7 @@
-import { ChefSyncSchema, CreateChefSyncSchema, UpdateChefSyncSchema } from "@app/services/secret-sync/chef";
+import { ChefSyncSchema, CreateChefSyncSchema, UpdateChefSyncSchema } from "@app/ee/services/secret-sync/chef";
+import { registerSyncSecretsEndpoints } from "@app/server/routes/v1/secret-sync-routers/secret-sync-endpoints";
 import { SecretSync } from "@app/services/secret-sync/secret-sync-enums";
 
-import { registerSyncSecretsEndpoints } from "./secret-sync-endpoints";
-
 export const registerChefSyncRouter = async (server: FastifyZodProvider) =>
   registerSyncSecretsEndpoints({
     destination: SecretSync.Chef,

backend/src/ee/services/app-connections/chef/chef-connection-fns.ts

@@ -5,10 +5,10 @@ import { request } from "@app/lib/config/request";
 import { BadRequestError } from "@app/lib/errors";
 import { removeTrailingSlash } from "@app/lib/fn";
 import { blockLocalAndPrivateIpAddresses } from "@app/lib/validator";
+import { AppConnection } from "@app/services/app-connection/app-connection-enums";
 import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
 
 import { TChefDataBagItemContent } from "../../secret-sync/chef/chef-sync-types";
-import { AppConnection } from "../app-connection-enums";
 import { ChefConnectionMethod } from "./chef-connection-enums";
 import {
   TChefConnection,

backend/src/ee/services/app-connections/chef/chef-connection-service.ts

@@ -1,7 +1,8 @@
-import { ForbiddenRequestError } from "@app/lib/errors";
+import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";
 import { OrgServiceActor } from "@app/lib/types";
 
-import { AppConnection } from "../app-connection-enums";
+import { AppConnection } from "../../../../services/app-connection/app-connection-enums";
+import { TLicenseServiceFactory } from "../../license/license-service";
 import { listChefDataBagItems, listChefDataBags } from "./chef-connection-fns";
 import { TChefConnection } from "./chef-connection-types";
 
@@ -11,8 +12,23 @@ type TGetAppConnectionFunc = (
   actor: OrgServiceActor
 ) => Promise<TChefConnection>;
 
-export const chefConnectionService = (getAppConnection: TGetAppConnectionFunc) => {
+// Enterprise check
+export const checkPlan = async (licenseService: Pick<TLicenseServiceFactory, "getPlan">, orgId: string) => {
+  const plan = await licenseService.getPlan(orgId);
+  if (!plan.enterpriseAppConnections)
+    throw new BadRequestError({
+      message:
+        "Failed to use app connection due to plan restriction. Upgrade plan to access enterprise app connections."
+    });
+};
+
+export const chefConnectionService = (
+  getAppConnection: TGetAppConnectionFunc,
+  licenseService: Pick<TLicenseServiceFactory, "getPlan">
+) => {
   const listDataBags = async (appConnectionId: string, actor: OrgServiceActor) => {
+    await checkPlan(licenseService, actor.orgId);
+
     const appConnection = await getAppConnection(AppConnection.Chef, appConnectionId, actor);
 
     if (!appConnection) {
@@ -23,6 +39,8 @@ export const chefConnectionService = (getAppConnection: TGetAppConnectionFunc) =
   };
 
   const listDataBagItems = async (appConnectionId: string, dataBagName: string, actor: OrgServiceActor) => {
+    await checkPlan(licenseService, actor.orgId);
+
     const appConnection = await getAppConnection(AppConnection.Chef, appConnectionId, actor);
 
     if (!appConnection) {

backend/src/ee/services/app-connections/chef/chef-connection-types.ts

@@ -1,9 +1,9 @@
 import z from "zod";
 
+import { TChefDataBagItemContent } from "@app/ee/services/secret-sync/chef";
 import { DiscriminativePick } from "@app/lib/types";
-import { TChefDataBagItemContent } from "@app/services/secret-sync/chef";
 
-import { AppConnection } from "../app-connection-enums";
+import { AppConnection } from "../../../../services/app-connection/app-connection-enums";
 import {
   ChefConnectionSchema,
   CreateChefConnectionSchema,

backend/src/ee/services/gateway-v2/gateway-v2-service.ts

@@ -3,7 +3,7 @@ import net from "node:net";
 import { ForbiddenError } from "@casl/ability";
 import * as x509 from "@peculiar/x509";
 
-import { OrganizationActionScope, OrgMembershipRole, TRelays } from "@app/db/schemas";
+import { OrganizationActionScope, OrgMembershipRole, OrgMembershipStatus, TRelays } from "@app/db/schemas";
 import { PgSqlLock } from "@app/keystore/keystore";
 import { crypto } from "@app/lib/crypto";
 import { DatabaseErrorCode } from "@app/lib/error-codes";
@@ -909,7 +909,9 @@ export const gatewayV2ServiceFactory = ({
 
     for await (const [orgId, gateways] of Object.entries(gatewaysByOrg)) {
       try {
-        const admins = await orgDAL.findOrgMembersByRole(orgId, OrgMembershipRole.Admin);
+        const admins = (await orgDAL.findOrgMembersByRole(orgId, OrgMembershipRole.Admin)).filter(
+          (admin) => admin.status !== OrgMembershipStatus.Invited
+        );
         if (admins.length === 0) {
           logger.warn({ orgId }, "Organization has no admins to notify about unhealthy gateway.");
           // eslint-disable-next-line no-continue

backend/src/ee/services/pam-account/pam-account-service.ts

@@ -480,6 +480,36 @@ export const pamAccountServiceFactory = ({
       throw new NotFoundError({ message: `Gateway connection details for gateway '${gatewayId}' not found.` });
     }
 
+    let metadata;
+
+    switch (resourceType) {
+      case PamResource.Postgres:
+      case PamResource.MySQL:
+        {
+          const connectionCredentials = await decryptResourceConnectionDetails({
+            encryptedConnectionDetails: resource.encryptedConnectionDetails,
+            kmsService,
+            projectId: account.projectId
+          });
+
+          const credentials = await decryptAccountCredentials({
+            encryptedCredentials: account.encryptedCredentials,
+            kmsService,
+            projectId: account.projectId
+          });
+
+          metadata = {
+            username: credentials.username,
+            database: connectionCredentials.database,
+            accountName: account.name,
+            accountPath
+          };
+        }
+        break;
+      default:
+        break;
+    }
+
     return {
       sessionId: session.id,
       resourceType,
@@ -491,7 +521,8 @@ export const pamAccountServiceFactory = ({
       gatewayServerCertificateChain: gatewayConnectionDetails.gateway.serverCertificateChain,
       relayHost: gatewayConnectionDetails.relayHost,
       projectId: account.projectId,
-      account
+      account,
+      metadata
     };
   };
 

backend/src/ee/services/pam-resource/shared/sql/sql-resource-factory.ts

@@ -1,6 +1,5 @@
 import knex from "knex";
 import mysql, { Connection } from "mysql2/promise";
-import * as pg from "pg";
 import tls, { PeerCertificate } from "tls";
 
 import { verifyHostInputValidity } from "@app/ee/services/dynamic-secret/dynamic-secret-fns";
@@ -97,7 +96,7 @@ const makeSqlConnection = (
           try {
             await client.raw(SIMPLE_QUERY);
           } catch (error) {
-            if (error instanceof pg.DatabaseError) {
+            if (error instanceof Error) {
               // Hacky way to know if we successfully hit the database.
               // TODO: potentially two approaches to solve the problem.
               //       1. change the work flow, add account first then resource

backend/src/ee/services/permission/permission-dal.ts

@@ -201,11 +201,11 @@ export const permissionDALFactory = (db: TDbClient): TPermissionDALFactory => {
         .leftJoin(TableName.IdentityMetadata, (queryBuilder) => {
           if (actorType === ActorType.USER) {
             void queryBuilder
-              .on(`${TableName.Membership}.actorUserId`, `${TableName.IdentityMetadata}.userId`)
+              .on(`${TableName.IdentityMetadata}.userId`, db.raw("?", [actorId]))
               .andOn(`${TableName.Membership}.scopeOrgId`, `${TableName.IdentityMetadata}.orgId`);
           } else if (actorType === ActorType.IDENTITY) {
             void queryBuilder
-              .on(`${TableName.Membership}.actorIdentityId`, `${TableName.IdentityMetadata}.identityId`)
+              .on(`${TableName.IdentityMetadata}.identityId`, db.raw("?", [actorId]))
               .andOn(`${TableName.Membership}.scopeOrgId`, `${TableName.IdentityMetadata}.orgId`);
           }
         })
@@ -488,7 +488,7 @@ export const permissionDALFactory = (db: TDbClient): TPermissionDALFactory => {
         })
         .leftJoin(TableName.IdentityMetadata, (queryBuilder) => {
           void queryBuilder
-            .on(`${TableName.Membership}.actorUserId`, `${TableName.IdentityMetadata}.userId`)
+            .on(`${TableName.Users}.id`, `${TableName.IdentityMetadata}.userId`)
             .andOn(`${TableName.Membership}.scopeOrgId`, `${TableName.IdentityMetadata}.orgId`);
         })
         .where(`${TableName.Membership}.scopeOrgId`, orgId)

backend/src/ee/services/relay/relay-service.ts

@@ -3,7 +3,7 @@ import { isIP } from "node:net";
 import { ForbiddenError } from "@casl/ability";
 import * as x509 from "@peculiar/x509";
 
-import { OrganizationActionScope, OrgMembershipRole, TRelays } from "@app/db/schemas";
+import { OrganizationActionScope, OrgMembershipRole, OrgMembershipStatus, TRelays } from "@app/db/schemas";
 import { PgSqlLock } from "@app/keystore/keystore";
 import { crypto } from "@app/lib/crypto";
 import { BadRequestError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";
@@ -996,7 +996,9 @@ export const relayServiceFactory = ({
         );
 
         if (existingRelay && (existingRelay.host !== host || existingRelay.name !== name)) {
-          return relayDAL.updateById(existingRelay.id, { host, name }, tx);
+          throw new BadRequestError({
+            message: `Machine identity already has an existing relay with the name "${existingRelay.name}" and host "${existingRelay.host}". Delete the existing relay or use a different machine identity.`
+          });
         }
 
         if (!existingRelay) {
@@ -1248,7 +1250,9 @@ export const relayServiceFactory = ({
             });
           }
         } else {
-          const admins = await orgDAL.findOrgMembersByRole(orgId, OrgMembershipRole.Admin);
+          const admins = (await orgDAL.findOrgMembersByRole(orgId, OrgMembershipRole.Admin)).filter(
+            (admin) => admin.status !== OrgMembershipStatus.Invited
+          );
           if (admins.length === 0) {
             // eslint-disable-next-line no-continue
             continue;

backend/src/ee/services/secret-approval-request/secret-approval-request-dal.ts

@@ -670,6 +670,7 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
         .select(
           db.ref("projectId").withSchema(TableName.Environment),
           db.ref("slug").withSchema(TableName.Environment).as("environment"),
+          db.ref("name").withSchema(TableName.Environment).as("environmentName"),
           db.ref("id").withSchema(TableName.SecretApprovalRequestReviewer).as("reviewerId"),
           db.ref("reviewerUserId").withSchema(TableName.SecretApprovalRequestReviewer),
           db.ref("status").withSchema(TableName.SecretApprovalRequestReviewer).as("reviewerStatus"),
@@ -699,30 +700,30 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
         )
         .as("inner");
 
-      const countQuery = (await (tx || db)
-        .select(db.raw("count(*) OVER() as total_count"))
-        .from(innerQuery.clone().distinctOn(`${TableName.SecretApprovalRequest}.id`))) as Array<{
-        total_count: number;
-      }>;
-
       const query = (tx || db).select("*").from(innerQuery).orderBy("createdAt", "desc") as typeof innerQuery;
 
       if (search) {
         void query.where((qb) => {
           void qb
             .whereRaw(`CONCAT_WS(' ', ??, ??) ilike ?`, [
-              db.ref("firstName").withSchema("committerUser"),
+              db.ref("committerUserFirstName"),
-              db.ref("lastName").withSchema("committerUser"),
+              db.ref("committerUserLastName"),
               `%${search}%`
             ])
-            .orWhereRaw(`?? ilike ?`, [db.ref("username").withSchema("committerUser"), `%${search}%`])
+            .orWhereRaw(`?? ilike ?`, [db.ref("committerUserUsername"), `%${search}%`])
-            .orWhereRaw(`?? ilike ?`, [db.ref("email").withSchema("committerUser"), `%${search}%`])
+            .orWhereRaw(`?? ilike ?`, [db.ref("committerUserEmail"), `%${search}%`])
-            .orWhereILike(`${TableName.Environment}.name`, `%${search}%`)
+            .orWhereILike(`environmentName`, `%${search}%`)
-            .orWhereILike(`${TableName.Environment}.slug`, `%${search}%`)
+            .orWhereILike(`environment`, `%${search}%`)
-            .orWhereILike(`${TableName.SecretApprovalPolicy}.secretPath`, `%${search}%`);
+            .orWhereILike(`policySecretPath`, `%${search}%`);
         });
       }
 
+      const countQuery = (await (tx || db)
+        .select(db.raw("count(*) OVER() as total_count"))
+        .from(query.clone().as("outer"))) as Array<{
+        total_count: number;
+      }>;
+
       const rankOffset = offset + 1;
       const docs = await (tx || db)
         .with("w", query)

backend/src/ee/services/secret-sync/chef/chef-sync-constants.ts

@@ -6,5 +6,6 @@ export const CHEF_SYNC_LIST_OPTION: TSecretSyncListItem = {
   name: "Chef",
   destination: SecretSync.Chef,
   connection: AppConnection.Chef,
-  canImportSecrets: true
+  canImportSecrets: true,
+  enterprise: true
 };

backend/src/ee/services/secret-sync/chef/chef-sync-fns.ts

@@ -1,4 +1,4 @@
-import { getChefDataBagItem, updateChefDataBagItem } from "@app/services/app-connection/chef";
+import { getChefDataBagItem, updateChefDataBagItem } from "@app/ee/services/app-connections/chef";
 import { matchesSchema } from "@app/services/secret-sync/secret-sync-fns";
 import { TSecretMap } from "@app/services/secret-sync/secret-sync-types";
 

backend/src/ee/services/secret-sync/chef/chef-sync-schemas.ts

@@ -42,5 +42,6 @@ export const ChefSyncListItemSchema = z.object({
   name: z.literal("Chef"),
   connection: z.literal(AppConnection.Chef),
   destination: z.literal(SecretSync.Chef),
-  canImportSecrets: z.literal(true)
+  canImportSecrets: z.literal(true),
+  enterprise: z.boolean()
 });

backend/src/ee/services/secret-sync/chef/chef-sync-types.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 
-import { TChefConnection } from "@app/services/app-connection/chef";
+import { TChefConnection } from "@app/ee/services/app-connections/chef";
 
 import { ChefSyncListItemSchema, ChefSyncSchema, CreateChefSyncSchema } from "./chef-sync-schemas";
 

backend/src/server/routes/sanitizedSchemas.ts

@@ -141,7 +141,8 @@ export const secretRawSchema = z.object({
       actorId: z.string().nullable().optional(),
       actorType: z.string().nullable().optional(),
       name: z.string().nullable().optional(),
-      membershipId: z.string().nullable().optional()
+      membershipId: z.string().nullable().optional(),
+      groupId: z.string().nullable().optional()
     })
     .optional()
     .nullable(),

backend/src/server/routes/v1/app-connection-routers/app-connection-router.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 
 import { ProjectType } from "@app/db/schemas";
+import { ChefConnectionListItemSchema, SanitizedChefConnectionSchema } from "@app/ee/services/app-connections/chef";
 import { OCIConnectionListItemSchema, SanitizedOCIConnectionSchema } from "@app/ee/services/app-connections/oci";
 import {
   OracleDBConnectionListItemSchema,
@@ -48,7 +49,6 @@ import {
   ChecklyConnectionListItemSchema,
   SanitizedChecklyConnectionSchema
 } from "@app/services/app-connection/checkly";
-import { ChefConnectionListItemSchema, SanitizedChefConnectionSchema } from "@app/services/app-connection/chef";
 import {
   CloudflareConnectionListItemSchema,
   SanitizedCloudflareConnectionSchema

backend/src/server/routes/v1/app-connection-routers/index.ts

@@ -1,3 +1,4 @@
+import { registerChefConnectionRouter } from "@app/ee/routes/v1/app-connection-routers/chef-connection-router";
 import { registerOCIConnectionRouter } from "@app/ee/routes/v1/app-connection-routers/oci-connection-router";
 import { registerOracleDBConnectionRouter } from "@app/ee/routes/v1/app-connection-routers/oracledb-connection-router";
 import { AppConnection } from "@app/services/app-connection/app-connection-enums";
@@ -13,7 +14,6 @@ import { registerAzureKeyVaultConnectionRouter } from "./azure-key-vault-connect
 import { registerBitbucketConnectionRouter } from "./bitbucket-connection-router";
 import { registerCamundaConnectionRouter } from "./camunda-connection-router";
 import { registerChecklyConnectionRouter } from "./checkly-connection-router";
-import { registerChefConnectionRouter } from "./chef-connection-router";
 import { registerCloudflareConnectionRouter } from "./cloudflare-connection-router";
 import { registerDatabricksConnectionRouter } from "./databricks-connection-router";
 import { registerDigitalOceanConnectionRouter } from "./digital-ocean-connection-router";

backend/src/server/routes/v1/project-membership-router.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 
 import {
   AccessScope,
+  OrgMembershipRole,
   ProjectMembershipRole,
   ProjectMembershipsSchema,
   ProjectUserMembershipRolesSchema,
@@ -266,6 +267,19 @@ export const registerProjectMembershipRouter = async (server: FastifyZodProvider
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
       const usernamesAndEmails = [...req.body.emails, ...req.body.usernames];
+
+      await server.services.membershipUser.createMembership({
+        permission: req.permission,
+        scopeData: {
+          scope: AccessScope.Organization,
+          orgId: req.permission.orgId
+        },
+        data: {
+          roles: [{ isTemporary: false, role: OrgMembershipRole.NoAccess }],
+          usernames: usernamesAndEmails
+        }
+      });
+
       const { memberships } = await server.services.membershipUser.createMembership({
         permission: req.permission,
         scopeData: {

backend/src/server/routes/v1/secret-sync-routers/index.ts

@@ -1,3 +1,4 @@
+import { registerChefSyncRouter } from "@app/ee/routes/v1/secret-sync-routers/chef-sync-router";
 import { registerOCIVaultSyncRouter } from "@app/ee/routes/v1/secret-sync-routers/oci-vault-sync-router";
 import { SecretSync } from "@app/services/secret-sync/secret-sync-enums";
 
@@ -10,7 +11,6 @@ import { registerAzureKeyVaultSyncRouter } from "./azure-key-vault-sync-router";
 import { registerBitbucketSyncRouter } from "./bitbucket-sync-router";
 import { registerCamundaSyncRouter } from "./camunda-sync-router";
 import { registerChecklySyncRouter } from "./checkly-sync-router";
-import { registerChefSyncRouter } from "./chef-sync-router";
 import { registerCloudflarePagesSyncRouter } from "./cloudflare-pages-sync-router";
 import { registerCloudflareWorkersSyncRouter } from "./cloudflare-workers-sync-router";
 import { registerDatabricksSyncRouter } from "./databricks-sync-router";

backend/src/server/routes/v1/secret-sync-routers/secret-sync-router.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 
 import { EventType } from "@app/ee/services/audit-log/audit-log-types";
+import { ChefSyncListItemSchema, ChefSyncSchema } from "@app/ee/services/secret-sync/chef";
 import { OCIVaultSyncListItemSchema, OCIVaultSyncSchema } from "@app/ee/services/secret-sync/oci-vault";
 import { ApiDocsTags, SecretSyncs } from "@app/lib/api-docs";
 import { readLimit } from "@app/server/config/rateLimiter";
@@ -24,7 +25,6 @@ import { AzureKeyVaultSyncListItemSchema, AzureKeyVaultSyncSchema } from "@app/s
 import { BitbucketSyncListItemSchema, BitbucketSyncSchema } from "@app/services/secret-sync/bitbucket";
 import { CamundaSyncListItemSchema, CamundaSyncSchema } from "@app/services/secret-sync/camunda";
 import { ChecklySyncListItemSchema, ChecklySyncSchema } from "@app/services/secret-sync/checkly/checkly-sync-schemas";
-import { ChefSyncListItemSchema, ChefSyncSchema } from "@app/services/secret-sync/chef";
 import {
   CloudflarePagesSyncListItemSchema,
   CloudflarePagesSyncSchema

backend/src/server/routes/v1/sso-router.ts

@@ -550,12 +550,14 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
         providerAuthToken: req.body.providerAuthToken
       });
 
-      void res.setCookie("jid", data.token.refresh, {
+      if ([AuthMethod.GOOGLE, AuthMethod.GITHUB, AuthMethod.GITLAB].includes(data.decodedProviderToken.authMethod)) {
-        httpOnly: true,
+        void res.setCookie("jid", data.token.refresh, {
-        path: "/",
+          httpOnly: true,
-        sameSite: "strict",
+          path: "/",
-        secure: appCfg.HTTPS_ENABLED
+          sameSite: "strict",
-      });
+          secure: appCfg.HTTPS_ENABLED
+        });
+      }
 
       addAuthOriginDomainCookie(res);
 

backend/src/services/app-connection/app-connection-fns.ts

@@ -1,5 +1,10 @@
 import { ProjectType } from "@app/db/schemas";
 import { TAppConnections } from "@app/db/schemas/app-connections";
+import {
+  ChefConnectionMethod,
+  getChefConnectionListItem,
+  validateChefConnectionCredentials
+} from "@app/ee/services/app-connections/chef";
 import {
   getOCIConnectionListItem,
   OCIConnectionMethod,
@@ -68,7 +73,6 @@ import {
 } from "./bitbucket";
 import { CamundaConnectionMethod, getCamundaConnectionListItem, validateCamundaConnectionCredentials } from "./camunda";
 import { ChecklyConnectionMethod, getChecklyConnectionListItem, validateChecklyConnectionCredentials } from "./checkly";
-import { ChefConnectionMethod, getChefConnectionListItem, validateChefConnectionCredentials } from "./chef";
 import { CloudflareConnectionMethod } from "./cloudflare/cloudflare-connection-enum";
 import {
   getCloudflareConnectionListItem,

backend/src/services/app-connection/app-connection-maps.ts

@@ -86,6 +86,6 @@ export const APP_CONNECTION_PLAN_MAP: Record<AppConnection, AppConnectionPlanTyp
   [AppConnection.Netlify]: AppConnectionPlanType.Regular,
   [AppConnection.Okta]: AppConnectionPlanType.Regular,
   [AppConnection.Redis]: AppConnectionPlanType.Regular,
-  [AppConnection.Chef]: AppConnectionPlanType.Regular,
+  [AppConnection.Chef]: AppConnectionPlanType.Enterprise,
   [AppConnection.Northflank]: AppConnectionPlanType.Regular
 };

backend/src/services/app-connection/app-connection-service.ts

@@ -1,6 +1,8 @@
 import { ForbiddenError, subject } from "@casl/ability";
 
 import { ActionProjectType, OrganizationActionScope, TAppConnections } from "@app/db/schemas";
+import { ValidateChefConnectionCredentialsSchema } from "@app/ee/services/app-connections/chef";
+import { chefConnectionService } from "@app/ee/services/app-connections/chef/chef-connection-service";
 import { ValidateOCIConnectionCredentialsSchema } from "@app/ee/services/app-connections/oci";
 import { ociConnectionService } from "@app/ee/services/app-connections/oci/oci-connection-service";
 import { ValidateOracleDBConnectionCredentialsSchema } from "@app/ee/services/app-connections/oracledb";
@@ -67,8 +69,6 @@ import { ValidateCamundaConnectionCredentialsSchema } from "./camunda";
 import { camundaConnectionService } from "./camunda/camunda-connection-service";
 import { ValidateChecklyConnectionCredentialsSchema } from "./checkly";
 import { checklyConnectionService } from "./checkly/checkly-connection-service";
-import { ValidateChefConnectionCredentialsSchema } from "./chef";
-import { chefConnectionService } from "./chef/chef-connection-service";
 import { ValidateCloudflareConnectionCredentialsSchema } from "./cloudflare/cloudflare-connection-schema";
 import { cloudflareConnectionService } from "./cloudflare/cloudflare-connection-service";
 import { ValidateDatabricksConnectionCredentialsSchema } from "./databricks";
@@ -885,6 +885,6 @@ export const appConnectionServiceFactory = ({
     northflank: northflankConnectionService(connectAppConnectionById),
     okta: oktaConnectionService(connectAppConnectionById),
     laravelForge: laravelForgeConnectionService(connectAppConnectionById),
-    chef: chefConnectionService(connectAppConnectionById)
+    chef: chefConnectionService(connectAppConnectionById, licenseService)
   };
 };

backend/src/services/app-connection/app-connection-types.ts

@@ -1,3 +1,9 @@
+import {
+  TChefConnection,
+  TChefConnectionConfig,
+  TChefConnectionInput,
+  TValidateChefConnectionCredentialsSchema
+} from "@app/ee/services/app-connections/chef";
 import {
   TOCIConnection,
   TOCIConnectionConfig,
@@ -82,12 +88,6 @@ import {
   TChecklyConnectionInput,
   TValidateChecklyConnectionCredentialsSchema
 } from "./checkly";
-import {
-  TChefConnection,
-  TChefConnectionConfig,
-  TChefConnectionInput,
-  TValidateChefConnectionCredentialsSchema
-} from "./chef";
 import {
   TCloudflareConnection,
   TCloudflareConnectionConfig,

backend/src/services/identity-oidc-auth/identity-oidc-auth-service.ts

@@ -112,7 +112,20 @@ export const identityOidcAuthServiceFactory = ({
       });
 
       const { kid } = decodedToken.header as { kid: string };
-      const oidcSigningKey = await client.getSigningKey(kid);
+
+      let oidcSigningKey;
+      try {
+        oidcSigningKey = await client.getSigningKey(kid);
+      } catch (error) {
+        if (error instanceof Error && error.name === "SigningKeyNotFoundError") {
+          throw new UnauthorizedError({
+            message: `Access denied: Unable to verify JWT signature. The signing key '${kid}' was not found in the OIDC provider's JWKS endpoint. This may indicate an invalid token or misconfigured OIDC provider.`
+          });
+        }
+        throw new UnauthorizedError({
+          message: `Access denied: Failed to retrieve signing key from OIDC provider: ${error instanceof Error ? error.message : String(error)}`
+        });
+      }
 
       let tokenData: Record<string, string>;
       try {

backend/src/services/identity-token-auth/identity-token-auth-service.ts

@@ -244,8 +244,8 @@ export const identityTokenAuthServiceFactory = ({
     }
 
     if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.TOKEN_AUTH)) {
-      throw new BadRequestError({
+      throw new NotFoundError({
-        message: "The identity does not have Token Auth attached"
+        message: "Token Auth configuration not found for identity"
       });
     }
 

backend/src/services/secret-folder/secret-folder-dal.ts

@@ -419,13 +419,14 @@ export const secretFolderDALFactory = (db: TDbClient) => {
         .select(
           selectAllTableCols(TableName.SecretFolder),
           db.raw(
-            `DENSE_RANK() OVER (ORDER BY ${TableName.SecretFolder}."name" ${
+            `DENSE_RANK() OVER (ORDER BY ${TableName.SecretFolder}."name" COLLATE "en-x-icu" ${orderDirection === OrderByDirection.ASC ? "ASC" : "DESC"}) as rank`
-              orderDirection ?? OrderByDirection.ASC
-            }) as rank`
           ),
           db.ref("slug").withSchema(TableName.Environment).as("environment")
         )
-        .orderBy(`${TableName.SecretFolder}.${orderBy}`, orderDirection);
+        .orderByRaw(
+          `${TableName.SecretFolder}.?? COLLATE "en-x-icu" ${orderDirection === OrderByDirection.ASC ? "ASC" : "DESC"}`,
+          [orderBy]
+        );
 
       if (limit) {
         const rankOffset = offset + 1; // ranks start from 1
@@ -434,7 +435,10 @@ export const secretFolderDALFactory = (db: TDbClient) => {
           .select("*")
           .from<Awaited<typeof query>[number]>("w")
           .where("w.rank", ">=", rankOffset)
-          .andWhere("w.rank", "<", rankOffset + limit);
+          .andWhere("w.rank", "<", rankOffset + limit)
+          .orderByRaw(`"w".?? COLLATE "en-x-icu" ${orderDirection === OrderByDirection.ASC ? "ASC" : "DESC"}`, [
+            orderBy
+          ]);
       }
 
       const folders = await query;
@@ -445,7 +449,10 @@ export const secretFolderDALFactory = (db: TDbClient) => {
     }
   };
 
-  const findByEnvsDeep = async ({ parentIds }: TFindFoldersDeepByParentIdsDTO, tx?: Knex) => {
+  const findByEnvsDeep = async (
+    { parentIds, orderBy = SecretsOrderBy.Name, orderDirection = OrderByDirection.ASC }: TFindFoldersDeepByParentIdsDTO,
+    tx?: Knex
+  ) => {
     try {
       const folders = await (tx || db.replicaNode())
         .withRecursive("parents", (qb) =>
@@ -480,7 +487,9 @@ export const secretFolderDALFactory = (db: TDbClient) => {
         .select<(TSecretFolders & { path: string; depth: number; environment: string })[]>("*")
         .from("parents")
         .orderBy("depth")
-        .orderBy(`name`);
+        .orderByRaw(`"parents".?? COLLATE "en-x-icu" ${orderDirection === OrderByDirection.ASC ? "ASC" : "DESC"}`, [
+          orderBy
+        ]);
 
       return folders;
     } catch (error) {

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

@@ -14,6 +14,7 @@ import { PgSqlLock } from "@app/keystore/keystore";
 import { BadRequestError, NotFoundError } from "@app/lib/errors";
 import { OrderByDirection, OrgServiceActor } from "@app/lib/types";
 import { ActorType } from "@app/services/auth/auth-type";
+import { SecretsOrderBy } from "@app/services/secret/secret-types";
 import { buildFolderPath } from "@app/services/secret-folder/secret-folder-fns";
 
 import {
@@ -781,7 +782,11 @@ export const secretFolderServiceFactory = ({
     if (!parentFolder) return [];
 
     if (recursive) {
-      const recursiveFolders = await folderDAL.findByEnvsDeep({ parentIds: [parentFolder.id] });
+      const recursiveFolders = await folderDAL.findByEnvsDeep({
+        parentIds: [parentFolder.id],
+        orderBy: orderBy || SecretsOrderBy.Name,
+        orderDirection: orderDirection || OrderByDirection.ASC
+      });
       // remove the parent folder
       return recursiveFolders
         .filter((folder) => {
@@ -800,19 +805,15 @@ export const secretFolderServiceFactory = ({
         }));
     }
 
-    const folders = await folderDAL.find(
+    const folders = await folderDAL.findByMultiEnv({
-      {
+      environmentIds: [env.id],
-        envId: env.id,
+      parentIds: [parentFolder.id],
-        parentId: parentFolder.id,
+      search,
-        isReserved: false,
+      orderBy: orderBy || SecretsOrderBy.Name,
-        $search: search ? { name: `%${search}%` } : undefined
+      orderDirection: orderDirection || OrderByDirection.ASC,
-      },
+      limit,
-      {
+      offset
-        sort: orderBy ? [[orderBy, orderDirection ?? OrderByDirection.ASC]] : undefined,
+    });
-        limit,
-        offset
-      }
-    );
     if (lastSecretModified) {
       return folders.filter((el) =>
         el.lastSecretModified ? el.lastSecretModified >= new Date(lastSecretModified) : false

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

@@ -64,6 +64,8 @@ export type TGetFoldersDeepByEnvsDTO = {
 
 export type TFindFoldersDeepByParentIdsDTO = {
   parentIds: string[];
+  orderBy?: SecretsOrderBy;
+  orderDirection?: OrderByDirection;
 };
 
 export type TCreateManyFoldersDTO = {

backend/src/services/secret-sync/secret-sync-fns.ts

@@ -4,6 +4,7 @@ import handlebars from "handlebars";
 import { TGatewayServiceFactory } from "@app/ee/services/gateway/gateway-service";
 import { TGatewayV2ServiceFactory } from "@app/ee/services/gateway-v2/gateway-v2-service";
 import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
+import { CHEF_SYNC_LIST_OPTION, ChefSyncFns } from "@app/ee/services/secret-sync/chef";
 import { OCI_VAULT_SYNC_LIST_OPTION, OCIVaultSyncFns } from "@app/ee/services/secret-sync/oci-vault";
 import { BadRequestError } from "@app/lib/errors";
 import {
@@ -34,7 +35,6 @@ import { BITBUCKET_SYNC_LIST_OPTION, BitbucketSyncFns } from "./bitbucket";
 import { CAMUNDA_SYNC_LIST_OPTION, camundaSyncFactory } from "./camunda";
 import { CHECKLY_SYNC_LIST_OPTION } from "./checkly/checkly-sync-constants";
 import { ChecklySyncFns } from "./checkly/checkly-sync-fns";
-import { CHEF_SYNC_LIST_OPTION, ChefSyncFns } from "./chef";
 import { CLOUDFLARE_PAGES_SYNC_LIST_OPTION } from "./cloudflare-pages/cloudflare-pages-constants";
 import { CloudflarePagesSyncFns } from "./cloudflare-pages/cloudflare-pages-fns";
 import { CLOUDFLARE_WORKERS_SYNC_LIST_OPTION, CloudflareWorkersSyncFns } from "./cloudflare-workers";

backend/src/services/secret-sync/secret-sync-maps.ts

@@ -107,7 +107,7 @@ export const SECRET_SYNC_PLAN_MAP: Record<SecretSync, SecretSyncPlanType> = {
   [SecretSync.Northflank]: SecretSyncPlanType.Regular,
   [SecretSync.Bitbucket]: SecretSyncPlanType.Regular,
   [SecretSync.LaravelForge]: SecretSyncPlanType.Regular,
-  [SecretSync.Chef]: SecretSyncPlanType.Regular
+  [SecretSync.Chef]: SecretSyncPlanType.Enterprise
 };
 
 export const SECRET_SYNC_SKIP_FIELDS_MAP: Record<SecretSync, string[]> = {

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

@@ -1,6 +1,12 @@
 import { Job } from "bullmq";
 
 import { AuditLogInfo } from "@app/ee/services/audit-log/audit-log-types";
+import {
+  TChefSync,
+  TChefSyncInput,
+  TChefSyncListItem,
+  TChefSyncWithCredentials
+} from "@app/ee/services/secret-sync/chef";
 import {
   TOCIVaultSync,
   TOCIVaultSyncInput,
@@ -21,7 +27,6 @@ import {
   TCamundaSyncListItem,
   TCamundaSyncWithCredentials
 } from "@app/services/secret-sync/camunda";
-import { TChefSync, TChefSyncInput, TChefSyncListItem, TChefSyncWithCredentials } from "@app/services/secret-sync/chef";
 import {
   TDatabricksSync,
   TDatabricksSyncInput,

backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts

@@ -793,6 +793,7 @@ export const reshapeBridgeSecret = (
     userActorId?: string | null;
     identityActorId?: string | null;
     membershipId?: string | null;
+    groupId?: string | null;
     actorType?: string | null;
     tags?: {
       id: string;
@@ -823,7 +824,8 @@ export const reshapeBridgeSecret = (
         actorType: secret.actorType,
         actorId: secret.userActorId || secret.identityActorId,
         name: secret.identityActorName || secret.userActorName,
-        membershipId: secret.membershipId
+        membershipId: secret.membershipId,
+        groupId: secret.groupId
       }
     : undefined,
   tags: secret.tags,

backend/src/services/secret-v2-bridge/secret-version-dal.ts

@@ -182,7 +182,6 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {
 
   const findVersionsBySecretIdWithActors = async ({
     secretId,
-    projectId,
     secretVersions,
     findOpt = {},
     tx
@@ -196,13 +195,22 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {
     try {
       const { offset, limit, sort = [["createdAt", "desc"]] } = findOpt;
       const query = (tx || db.replicaNode())(TableName.SecretVersionV2)
+        .leftJoin(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.SecretVersionV2}.folderId`)
+        .leftJoin(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolder}.envId`)
         .leftJoin(TableName.Users, `${TableName.Users}.id`, `${TableName.SecretVersionV2}.userActorId`)
+        .leftJoin(TableName.Identity, `${TableName.Identity}.id`, `${TableName.SecretVersionV2}.identityActorId`)
+        .leftJoin(TableName.UserGroupMembership, `${TableName.UserGroupMembership}.userId`, `${TableName.Users}.id`)
         .leftJoin(TableName.Membership, (qb) => {
           void qb
-            .on(`${TableName.Membership}.actorUserId`, `${TableName.SecretVersionV2}.userActorId`)
+            .on(`${TableName.Membership}.scope`, db.raw("?", [AccessScope.Project]))
-            .andOn(`${TableName.Membership}.scope`, db.raw("?", [AccessScope.Project]));
+            .andOn(`${TableName.Membership}.scopeProjectId`, `${TableName.Environment}.projectId`)
+            .andOn((sqb) => {
+              void sqb
+                .on(`${TableName.Membership}.actorUserId`, `${TableName.SecretVersionV2}.userActorId`)
+                .orOn(`${TableName.Membership}.actorIdentityId`, `${TableName.SecretVersionV2}.identityActorId`)
+                .orOn(`${TableName.Membership}.actorGroupId`, `${TableName.UserGroupMembership}.groupId`);
+            });
         })
-        .leftJoin(TableName.Identity, `${TableName.Identity}.id`, `${TableName.SecretVersionV2}.identityActorId`)
         .leftJoin(TableName.SecretV2, `${TableName.SecretVersionV2}.secretId`, `${TableName.SecretV2}.id`)
         .leftJoin(
           TableName.SecretVersionV2Tag,
@@ -216,12 +224,6 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {
         )
         .where((qb) => {
           void qb.where(`${TableName.SecretVersionV2}.secretId`, secretId);
-          void qb.where(`${TableName.Membership}.scopeProjectId`, projectId);
-          if (secretVersions?.length) void qb.whereIn(`${TableName.SecretVersionV2}.version`, secretVersions);
-        })
-        .orWhere((qb) => {
-          void qb.where(`${TableName.SecretVersionV2}.secretId`, secretId);
-          void qb.whereNull(`${TableName.Membership}.scopeProjectId`);
           if (secretVersions?.length) void qb.whereIn(`${TableName.SecretVersionV2}.version`, secretVersions);
         })
         .select(
@@ -229,6 +231,7 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {
           db.ref("username").withSchema(TableName.Users).as("userActorName"),
           db.ref("name").withSchema(TableName.Identity).as("identityActorName"),
           db.ref("id").withSchema(TableName.Membership).as("membershipId"),
+          db.ref("actorGroupId").withSchema(TableName.Membership).as("groupId"),
           db.ref("id").withSchema(TableName.SecretTag).as("tagId"),
           db.ref("color").withSchema(TableName.SecretTag).as("tagColor"),
           db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug")
@@ -256,7 +259,8 @@ export const secretVersionV2BridgeDALFactory = (db: TDbClient) => {
           ...SecretVersionsV2Schema.parse(el),
           userActorName: el.userActorName,
           identityActorName: el.identityActorName,
-          membershipId: el.membershipId
+          membershipId: el.membershipId,
+          groupId: el.groupId
         }),
         childrenMapper: [
           {

docs/docs.json

@@ -784,7 +784,10 @@
             "groups": [
               {
                 "group": "Infisical PAM",
-                "pages": ["documentation/platform/pam/overview"]
+                "pages": [
+                  "documentation/platform/pam/overview",
+                  "documentation/platform/pam/session-recording"
+                ]
               }
             ]
           }

docs/documentation/guides/organization-structure.mdx

@@ -24,9 +24,11 @@ Infisical is designed to provide comprehensive, centralized, and efficient manag
 ### 2. Projects
 
 - **Definition and Role**: [Projects](/documentation/platform/project) are the highest-level construct within an [organization](/documentation/platform/organization) in Infisical. They serve as the primary container for all functionalities.
-- **Correspondence to Code Repositories**: Projects typically align with specific code repositories.
+- **Common Project Mappings**: Projects typically align with applications, services, or code repositories — each being a valid and common approach depending on your organizational structure.
 - **Functional Capabilities**: Each project encompasses features for managing secrets, certificates, and encryption keys, serving as the central hub for these resources.
 
+<Note>Projects are isolated from one another. Secrets, certificates, and other resources cannot be shared or referenced across different projects. Each project maintains its own separate set of resources.</Note>
+
 ### 3. Environments
 
 - **Purpose**: Environments are designed for organizing and compartmentalizing secrets within projects.
@@ -40,8 +42,9 @@ Infisical is designed to provide comprehensive, centralized, and efficient manag
 
 ### 5. Imports
 
-- **Purpose and Benefits**: To promote reusability and avoid redundancy, Infisical supports the use of imports. This allows secrets, folders, or entire environments to be referenced across multiple projects as needed.
+- **Purpose and Benefits**: To promote reusability and avoid redundancy within a project, Infisical supports the use of imports and references. This allows secrets, folders, or entire environments to be referenced within the same project as needed.
-- **Best Practice**: Utilizing [secret imports](/documentation/platform/secret-reference#secret-imports) or [references](/documentation/platform/secret-reference#secret-referencing) ensures consistency and minimizes manual overhead.
+- **Project Isolation**: Imports and references only work within a single project. Secrets cannot be imported or referenced across different projects, as projects are isolated from one another.
+- **Best Practice**: Utilizing [secret imports](/documentation/platform/secret-reference#secret-imports) or [references](/documentation/platform/secret-reference#secret-referencing) ensures consistency and minimizes manual overhead when managing secrets within a project.
 
 ### 6. Approval Workflows
 

docs/documentation/platform/kms/hsm-integration.mdx

@@ -30,13 +30,96 @@ Using a hardware security module comes with the added benefit of having a secure
 Enabling HSM encryption has a set of key benefits:
 1. **Root Key Wrapping**: The root KMS encryption key that is used to secure your Infisical instance will be encrypted using the HSM device rather than the standard software-protected key.
 
+
 #### Caveats
 - **Performance**: Using an HSM device can have a performance impact on your Infisical instance. This is due to the additional latency introduced by the HSM device. This is however only noticeable when your instance(s) start up or when the encryption strategy is changed.
 - **Key Recovery**: If the HSM device is lost or destroyed, you will no longer be able to decrypt your data stored within Infisical. Most HSM providers offer recovery options, which you should consider when setting up an HSM device.
 
-### Requirements
+## Requirements
-- An Infisical instance with a version number that is equal to or greater than `v0.91.0`.
+- An HSM device _(PKCS#11 compatible library)_ from a compatible provider such as [Thales Luna HSM](https://cpl.thalesgroup.com/encryption/data-protection-on-demand/services/luna-cloud-hsm), [AWS CloudHSM](https://aws.amazon.com/cloudhsm/), [Fortanix HSM](https://www.fortanix.com/platform/data-security-manager), or others.
-- An HSM device from a provider such as [Thales Luna HSM](https://cpl.thalesgroup.com/encryption/data-protection-on-demand/services/luna-cloud-hsm), [AWS CloudHSM](https://aws.amazon.com/cloudhsm/), [Fortanix HSM](https://www.fortanix.com/platform/data-security-manager), or others.
+  Infisical is validated to work with PKCS#11 2.30 and newer. If your HSM device doesn't follow the >=2.30 PKCS#11 standard you may see degraded performance.
+
+
+## Environment Variable Configuration
+To configure your Infisical instance to use an HSM, you must set the required environment variables. Below you'll find an example of the required environment variables.
+For further instructions on how to configure the HSM device for your Infisical instance, please see the [Setup Instructions](#setup-instructions) section.
+
+
+```dotenv
+HSM_LIB_PATH=/usr/local/lib/cloudhsm/cloudhsm.so
+HSM_SLOT=1
+HSM_KEY_LABEL=infisical-key
+HSM_PIN=your:pin
+```
+
+- `HSM_LIB_PATH`: The path to the PKCS#11 library provided by the HSM provider. This usually comes in the form of a `.so` for Linux and MacOS, or a `.dll` file for Windows. For Docker, you need to mount the library path as a volume. Further instructions can be found below. If you are using Docker, make sure to set the HSM_LIB_PATH environment variable to the path where the library is mounted in the container.
+- `HSM_PIN`: The PKCS#11 PIN to use for authentication with the HSM device.
+- `HSM_SLOT`: The slot number to use for the HSM device. This is typically between `0` and `5` for most HSM devices.
+- `HSM_KEY_LABEL`: The label of the key to use for encryption. **Please note that if no key is found with the provided label, the HSM will create a new key with the provided label.**
+
+You can read more about the [default instance configurations](/self-hosting/configuration/envars) here.
+
+## PKCS#11 Key Attributes
+
+If no AES key or HMAC key already exists with the label you defined on the `HSM_KEY_LABEL` environment variable, then Infisical will create one for you automatically using the label specified on `HSM_KEY_LABEL`.
+Below you'll find a list of the attributes each key will be created with.
+
+### AES Key
+
+<Accordion title="Bring your own key minimum requirements (optional)">
+  If you bring your own AES key and don't let Infisical create it for you it must have at least the following attributes:
+
+  * `CKA_CLASS`: `CKO_SECRET_KEY` — Defines the key class _(secret key)_.
+  * `CKA_KEY_TYPE`: `CKO_AES` — Defines the key type _(AES key)_.
+  * `CKA_VALUE_LEN`: `32` — 256-bit key size.
+  * `CKA_ENCRYPT`: `true` — Encryption capabilities enabled.
+  * `CKA_DECRYPT`: `true` — Decryption capabilities enabled.
+  * `CKA_TOKEN`: `true` — The key material will persist in your HSM so it can be reused.
+
+  <Warning>
+    Note that for security reasons it is highly recommended to create an AES key with the full set of key attributes seen below if you're going to bring your own key.
+  </Warning>
+</Accordion>
+
+* `CKA_CLASS`: `CKO_SECRET_KEY` — Defines the key class _(secret key)_.
+* `CKA_KEY_TYPE`: `CKO_AES` — Defines the key type _(AES key)_.
+* `CKA_VALUE_LEN`: `32` — 256-bit key size.
+* `CKA_LABEL`: Your specified label in the `HSM_KEY_LABEL` environment variable.
+* `CKA_ENCRYPT`: `true` — Encryption capabilities enabled.
+* `CKA_DECRYPT`: `true` — Decryption capabilities enabled.
+* `CKA_TOKEN`: `true` — The key material will persist in your HSM so it can be reused.
+* `CKA_EXTRACTABLE`: `false` — The key material is not extractable from the HSM.
+* `CKA_SENSITIVE`: `true` — The key material is marked as sensitive.
+* `CKA_PRIVATE`: `true` — The key material is marked as private to the slot and can't be accessed from other slots.
+
+### HMAC Key
+
+<Accordion title="Bring your own key minimum requirements (optional)">
+  If you bring your own HMAC key and don't let Infisical create it for you it must have at least the following attributes:
+
+  * `CKA_CLASS`: `CKO_SECRET_KEY` — Defines the key class _(secret key)_.
+  * `CKA_KEY_TYPE`: `CKO_GENERIC_SECRET` — Defines the key class _(generic secret key)_.
+  * `CKA_VALUE_LEN`: `32` — 256-bit key size
+  * `CKA_SIGN`: `true` — Signing capabilities enabled
+  * `CKA_VERIFY`: `true` — Verifying capabilities enabled.
+  * `CKA_TOKEN`: `true` — The key material will persist in your HSM so it can be reused.
+
+  <Warning>
+    Note that for security reasons it is highly recommended to create an HMAC key with the full set of key attributes seen below if you're going to bring your own key.
+  </Warning>
+</Accordion>
+
+* `CKA_CLASS`: `CKO_SECRET_KEY` — Defines the key class _(secret key)_.
+* `CKA_KEY_TYPE`: `CKO_GENERIC_SECRET` — Defines the key class _(generic secret key)_.
+* `CKA_VALUE_LEN`: `32` — 256-bit key size.
+* `CKA_LABEL`: Your specified label in the `HSM_KEY_LABEL` environment variable, suffixed with `_HMAC`. If you specify `infisical-key-v1`, then the HMAC key label will become `infisical-key-v1_HMAC`.
+* `CKA_SIGN`: `true` — Signing capabilities enabled
+* `CKA_VERIFY`: `true` — Verifying capabilities enabled.
+* `CKA_TOKEN`: `true` — The key material will persist in your HSM so it can be reused.
+* `CKA_EXTRACTABLE`: `false` — The key material is not extractable from the HSM.
+* `CKA_SENSITIVE`: `true` — The key material is marked as sensitive.
+* `CKA_PRIVATE`: `true` — The key material is marked as private to the slot and can't be accessed from other slots.
+
 
 
 ## Setup Instructions

docs/documentation/platform/pam/session-recording.mdx

@@ -0,0 +1,60 @@
+---
+title: "Session Recording"
+sidebarTitle: "Session Recording"
+description: "Learn how Infisical records and stores session activity for auditing and monitoring."
+---
+
+Infisical's Privileged Access Management (PAM) provides robust session recording capabilities to help you audit and monitor user activity across your infrastructure.
+
+## How It Works
+
+When a user initiates a session through the Infisical Gateway, a recording of the session begins. The gateway securely caches all recording data in temporary encrypted files on its local system.
+
+Once the session concludes, the gateway transmits the complete recording to the Infisical platform for long-term, centralized storage. This asynchronous process ensures that sessions remain operational even if the connection to the Infisical platform is temporarily lost. After the upload is complete, administrators can search and review the session logs in the Infisical UI.
+
+## What's Captured
+
+The content captured during a session depends on the type of resource being accessed.
+
+### Database Sessions
+
+For database connections, Infisical captures all queries executed and their corresponding responses.
+
+<Note>
+Support for additional resource types like SSH and RDP is coming soon.
+</Note>
+
+## Viewing Recordings
+
+To review session recordings:
+
+1.  Navigate to the **PAM Sessions** page in your project.
+2.  Click on a session from the list to view its details.
+
+![PAM Sessions](/images/pam/session-recording/sessions-page.png)
+
+The session details page provides key information, including the complete session logs, connection status, the user who initiated it, and more.
+
+![PAM Individual Session](/images/pam/session-recording/individual-session-page.png)
+
+### Searching Logs
+
+You can use the search bar to quickly find relevant information:
+
+-   **On the main Sessions page:** Search across all session logs to locate specific queries or outputs.
+-   **On an individual session page:** Search within that specific session's logs to pinpoint activity.
+
+![PAM Sessions Search](/images/pam/session-recording/sessions-page-search.png)
+
+![PAM Individual Session Search](/images/pam/session-recording/individual-session-page-search.png)
+
+## FAQ
+
+<AccordionGroup>
+    <Accordion title="Are session recordings encrypted?">
+        Yes. All session recordings are encrypted at rest by default, ensuring your audit data is always secure.
+    </Accordion>
+    <Accordion title="Why aren't recordings streamed in real-time?">
+        Currently, Infisical uses an asynchronous approach where the gateway records the entire session locally before uploading it. This design makes your PAM sessions more resilient, as they don't depend on a constant, active connection to the Infisical platform. We may introduce live streaming capabilities in a future release.
+    </Accordion>
+</AccordionGroup>

docs/integrations/app-connections/chef.mdx

@@ -3,6 +3,14 @@ title: "Chef Connection"
 description: "Learn how to configure a Chef Connection for Infisical."
 ---
 
+<Info>
+    Chef App Connection is a paid feature.
+
+    If you're using Infisical Cloud, then it is available under the **Enterprise Tier**. If you're self-hosting Infisical,
+    then you should contact [email protected] to purchase an enterprise license to use it.
+
+</Info>
+
 Infisical supports the use of User Private Key to connect with Chef Server.
 
 Please access your **starter kit** to get all the required information to create a Chef Connection.

docs/integrations/platforms/kubernetes-injector.mdx

@@ -51,6 +51,27 @@ $ kubectl logs deployment/infisical-agent-injector
 2025/05/19 14:20:06 Successfully updated webhook configuration with CA bundle
 ```
 
+## Windows support
+
+The Infisical Agent Injector supports both running on Windows-based pods, and injecting the agent into Windows-based pods.
+
+To run the agent injector on a Windows pod, it's important that you add the `nodeSelector.kubernetes.io/os` label to the pod's deployment with the value `windows`.
+This can be done by changing the helm values.yaml by adding the following:
+
+```yaml values.yaml
+nodeSelector:
+  kubernetes.io/os: windows
+```
+
+By default the agent injector will run on Linux-based pods, unless you specify otherwise like in the example above.
+No extra configuration is needed to inject into Windows-based pods, as the agent injector will detect and handle the injection automatically.
+
+The Agent Injector will only run and inject into Windows-based pods that are running on the supported Windows versions:
+- **Windows Server 2022**
+
+We're looking to add support for other Windows versions in the future. If you're using a different Windows version, please let us know by opening [an issue](https://github.com/Infisical/infisical-agent-injector/issues/new), and we'll look into adding support for your desired version as soon as possible.
+
+
 ## Supported annotations
 
 The Infisical Agent Injector supports the following annotations:

docs/integrations/secret-syncs/chef.mdx

@@ -3,6 +3,14 @@ title: "Chef Sync"
 description: "Learn how to configure a Chef Sync for Infisical."
 ---
 
+<Info>
+    Chef Sync is a paid feature.
+
+    If you're using Infisical Cloud, then it is available under the **Enterprise Tier**. If you're self-hosting Infisical,
+    then you should contact [email protected] to purchase an enterprise license to use it.
+
+</Info>
+
 **Prerequisites:**
 
 - Create a [Chef Connection](/integrations/app-connections/chef)

docs/self-hosting/guides/monitoring-telemetry.mdx

@@ -27,7 +27,9 @@ Both approaches provide the same metrics data in OTEL format, so you can choose
 - Access to deploy monitoring services (Prometheus, Grafana, etc.)
 - Basic understanding of Prometheus and Grafana
 
-## Environment Variables
+## Setup
+
+### Environment Variables
 
 Configure the following environment variables in your Infisical backend:
 
@@ -37,287 +39,304 @@ OTEL_TELEMETRY_COLLECTION_ENABLED=true
 
 # Choose export type: "prometheus" or "otlp"
 OTEL_EXPORT_TYPE=prometheus
-
-# For OTLP push mode, also configure:
-# OTEL_EXPORT_OTLP_ENDPOINT=http://otel-collector:4318/v1/metrics
-# OTEL_COLLECTOR_BASIC_AUTH_USERNAME=your_collector_username
-# OTEL_COLLECTOR_BASIC_AUTH_PASSWORD=your_collector_password
-# OTEL_OTLP_PUSH_INTERVAL=30000
 ```
 
-**Note**: The `OTEL_COLLECTOR_BASIC_AUTH_USERNAME` and `OTEL_COLLECTOR_BASIC_AUTH_PASSWORD` values must match the credentials configured in your OpenTelemetry Collector's `basicauth/server` extension. These are not hardcoded values - you configure them in your collector configuration file.
+<Tabs>
+  <Tab title="Pull-based Monitoring (Prometheus)">
+    This approach exposes metrics on port 9464 at the `/metrics` endpoint, allowing Prometheus to scrape the data. The metrics are exposed in Prometheus format but originate from OpenTelemetry instrumentation.
 
-## Option 1: Pull-based Monitoring (Prometheus)
+    ### Configuration
 
-This approach exposes metrics on port 9464 at the `/metrics` endpoint, allowing Prometheus to scrape the data. The metrics are exposed in Prometheus format but originate from OpenTelemetry instrumentation.
+<Steps>
+  <Step title="Enable Prometheus export in Infisical">
+```bash
+OTEL_TELEMETRY_COLLECTION_ENABLED=true
+OTEL_EXPORT_TYPE=prometheus
+```
+  </Step>
 
-### Configuration
+  <Step title="Expose the metrics port">
+    Expose the metrics port in your Infisical backend:
 
-1. **Enable Prometheus export in Infisical**:
+    - **Docker**: Expose port 9464
+    - **Kubernetes**: Create a service exposing port 9464
+    - **Other**: Ensure port 9464 is accessible to your monitoring stack
+  </Step>
 
-   ```bash
+  <Step title="Create Prometheus configuration">
-   OTEL_TELEMETRY_COLLECTION_ENABLED=true
+Create `prometheus.yml`:
-   OTEL_EXPORT_TYPE=prometheus
-   ```
-
-2. **Expose the metrics port** in your Infisical backend:
-
-   - **Docker**: Expose port 9464
-   - **Kubernetes**: Create a service exposing port 9464
-   - **Other**: Ensure port 9464 is accessible to your monitoring stack
-
-3. **Create Prometheus configuration** (`prometheus.yml`):
-
-   ```yaml
-   global:
-     scrape_interval: 30s
-     evaluation_interval: 30s
-
-   scrape_configs:
-     - job_name: "infisical"
-       scrape_interval: 30s
-       static_configs:
-         - targets: ["infisical-backend:9464"] # Adjust hostname/port based on your deployment
-       metrics_path: "/metrics"
-   ```
-
-   **Note**: Replace `infisical-backend:9464` with the actual hostname and port where your Infisical backend is running. This could be:
-
-   - **Docker Compose**: `infisical-backend:9464` (service name)
-   - **Kubernetes**: `infisical-backend.default.svc.cluster.local:9464` (service name)
-   - **Bare Metal**: `192.168.1.100:9464` (actual IP address)
-   - **Cloud**: `your-infisical.example.com:9464` (domain name)
-
-### Deployment Options
-
-#### Docker Compose
 
 ```yaml
-services:
+global:
+  scrape_interval: 30s
+  evaluation_interval: 30s
+
+scrape_configs:
+  - job_name: "infisical"
+    scrape_interval: 30s
+    static_configs:
+      - targets: ["infisical-backend:9464"] # Adjust hostname/port based on your deployment
+    metrics_path: "/metrics"
+```
+
+<Note>
+Replace `infisical-backend:9464` with the actual hostname and port where your Infisical backend is running. This could be:
+
+- **Docker Compose**: `infisical-backend:9464` (service name)
+- **Kubernetes**: `infisical-backend.default.svc.cluster.local:9464` (service name)
+- **Bare Metal**: `192.168.1.100:9464` (actual IP address)
+- **Cloud**: `your-infisical.example.com:9464` (domain name)
+</Note>
+  </Step>
+</Steps>
+
+    ### Deployment Options
+
+    Once you've configured Infisical to expose metrics, you'll need to deploy Prometheus to scrape and store them. Below are examples for different deployment environments. Choose the option that matches your infrastructure.
+
+    <Tabs>
+      <Tab title="Docker Compose">
+        ```yaml
+        services:
+          prometheus:
+            image: prom/prometheus:latest
+            ports:
+              - "9090:9090"
+            volumes:
+              - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+            command:
+              - "--config.file=/etc/prometheus/prometheus.yml"
+
+          grafana:
+            image: grafana/grafana:latest
+            ports:
+              - "3000:3000"
+            environment:
+              - GF_SECURITY_ADMIN_USER=admin
+              - GF_SECURITY_ADMIN_PASSWORD=admin
+        ```
+      </Tab>
+      <Tab title="Kubernetes">
+        ```yaml
+        # prometheus-deployment.yaml
+        apiVersion: apps/v1
+        kind: Deployment
+        metadata:
+          name: prometheus
+        spec:
+          replicas: 1
+          selector:
+            matchLabels:
+              app: prometheus
+          template:
+            metadata:
+              labels:
+                app: prometheus
+            spec:
+              containers:
+                - name: prometheus
+                  image: prom/prometheus:latest
+                  ports:
+                    - containerPort: 9090
+                  volumeMounts:
+                    - name: config
+                      mountPath: /etc/prometheus
+              volumes:
+                - name: config
+                  configMap:
+                    name: prometheus-config
+
+        ---
+        # prometheus-service.yaml
+        apiVersion: v1
+        kind: Service
+        metadata:
+          name: prometheus
+        spec:
+          selector:
+            app: prometheus
+          ports:
+            - port: 9090
+              targetPort: 9090
+          type: ClusterIP
+        ```
+      </Tab>
+      <Tab title="Helm">
+        ```bash
+        helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+        helm install prometheus prometheus-community/prometheus \
+          --set server.config.global.scrape_interval=30s \
+          --set server.config.scrape_configs[0].job_name=infisical \
+          --set server.config.scrape_configs[0].static_configs[0].targets[0]=infisical-backend:9464
+        ```
+      </Tab>
+    </Tabs>
+
+  </Tab>
+  <Tab title="Push-based Monitoring (OTLP)">
+    This approach sends metrics directly to an OpenTelemetry Collector via the OTLP protocol. This gives you the most flexibility as you can configure the collector to export to multiple backends simultaneously.
+
+    ### Configuration
+
+<Steps>
+  <Step title="Enable OTLP export in Infisical">
+```bash
+OTEL_TELEMETRY_COLLECTION_ENABLED=true
+OTEL_EXPORT_TYPE=otlp
+OTEL_EXPORT_OTLP_ENDPOINT=http://otel-collector:4318/v1/metrics
+OTEL_COLLECTOR_BASIC_AUTH_USERNAME=infisical
+OTEL_COLLECTOR_BASIC_AUTH_PASSWORD=infisical
+OTEL_OTLP_PUSH_INTERVAL=30000
+```
+  </Step>
+
+  <Step title="Create OpenTelemetry Collector configuration">
+Create `otel-collector-config.yaml`:
+
+```yaml
+extensions:
+  health_check:
+  pprof:
+  zpages:
+  basicauth/server:
+    htpasswd:
+      inline: |
+        your_username:your_password
+
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: 0.0.0.0:4318
+        auth:
+          authenticator: basicauth/server
+
   prometheus:
-    image: prom/prometheus:latest
+    config:
-    ports:
+      scrape_configs:
-      - "9090:9090"
+        - job_name: otel-collector
-    volumes:
+          scrape_interval: 30s
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+          static_configs:
-    command:
+            - targets: [infisical-backend:9464]
-      - "--config.file=/etc/prometheus/prometheus.yml"
+          metric_relabel_configs:
+            - action: labeldrop
+              regex: "service_instance_id|service_name"
 
-  grafana:
+processors:
-    image: grafana/grafana:latest
+  batch:
-    ports:
+
-      - "3000:3000"
+exporters:
-    environment:
+  prometheus:
-      - GF_SECURITY_ADMIN_USER=admin
+    endpoint: "0.0.0.0:8889"
-      - GF_SECURITY_ADMIN_PASSWORD=admin
+    auth:
+      authenticator: basicauth/server
+    resource_to_telemetry_conversion:
+      enabled: true
+
+service:
+  extensions: [basicauth/server, health_check, pprof, zpages]
+  pipelines:
+    metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [prometheus]
 ```
 
-#### Kubernetes
+<Warning>
+Replace `your_username:your_password` with your chosen credentials. These must match the values you set in Infisical's `OTEL_COLLECTOR_BASIC_AUTH_USERNAME` and `OTEL_COLLECTOR_BASIC_AUTH_PASSWORD` environment variables.
+</Warning>
+  </Step>
+
+  <Step title="Create Prometheus configuration">
+Create Prometheus configuration for the collector:
 
 ```yaml
-# prometheus-deployment.yaml
+global:
-apiVersion: apps/v1
+  scrape_interval: 30s
-kind: Deployment
+  evaluation_interval: 30s
-metadata:
-  name: prometheus
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: prometheus
-  template:
-    metadata:
-      labels:
-        app: prometheus
-    spec:
-      containers:
-        - name: prometheus
-          image: prom/prometheus:latest
-          ports:
-            - containerPort: 9090
-          volumeMounts:
-            - name: config
-              mountPath: /etc/prometheus
-      volumes:
-        - name: config
-          configMap:
-            name: prometheus-config
 
----
+scrape_configs:
-# prometheus-service.yaml
+  - job_name: "otel-collector"
-apiVersion: v1
+    scrape_interval: 30s
-kind: Service
+    static_configs:
-metadata:
+      - targets: ["otel-collector:8889"] # Adjust hostname/port based on your deployment
-  name: prometheus
+    metrics_path: "/metrics"
-spec:
-  selector:
-    app: prometheus
-  ports:
-    - port: 9090
-      targetPort: 9090
-  type: ClusterIP
 ```
 
-#### Helm
+<Note>
+Replace `otel-collector:8889` with the actual hostname and port where your OpenTelemetry Collector is running. This could be:
 
-```bash
+- **Docker Compose**: `otel-collector:8889` (service name)
-helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+- **Kubernetes**: `otel-collector.default.svc.cluster.local:8889` (service name)
-helm install prometheus prometheus-community/prometheus \
+- **Bare Metal**: `192.168.1.100:8889` (actual IP address)
-  --set server.config.global.scrape_interval=30s \
+- **Cloud**: `your-collector.example.com:8889` (domain name)
-  --set server.config.scrape_configs[0].job_name=infisical \
+</Note>
-  --set server.config.scrape_configs[0].static_configs[0].targets[0]=infisical-backend:9464
+  </Step>
-```
+</Steps>
 
-## Option 2: Push-based Monitoring (OTLP)
+    ### Deployment Options
 
-This approach sends metrics directly to an OpenTelemetry Collector via the OTLP protocol. This gives you the most flexibility as you can configure the collector to export to multiple backends simultaneously.
+    After configuring Infisical and the OpenTelemetry Collector, you'll need to deploy the collector to receive metrics from Infisical. Below are examples for different deployment environments. Choose the option that matches your infrastructure.
 
-### Configuration
+    <Tabs>
+      <Tab title="Docker Compose">
+        ```yaml
+        services:
+          otel-collector:
+            image: otel/opentelemetry-collector-contrib:latest
+            ports:
+              - 4318:4318 # OTLP http receiver
+              - 8889:8889 # Prometheus exporter metrics
+            volumes:
+              - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml:ro
+            command:
+              - "--config=/etc/otelcol-contrib/config.yaml"
+        ```
+      </Tab>
+      <Tab title="Kubernetes">
+        ```yaml
+        # otel-collector-deployment.yaml
+        apiVersion: apps/v1
+        kind: Deployment
+        metadata:
+          name: otel-collector
+        spec:
+          replicas: 1
+          selector:
+            matchLabels:
+              app: otel-collector
+          template:
+            metadata:
+              labels:
+                app: otel-collector
+            spec:
+              containers:
+                - name: otel-collector
+                  image: otel/opentelemetry-collector-contrib:latest
+                  ports:
+                    - containerPort: 4318
+                    - containerPort: 8889
+                  volumeMounts:
+                    - name: config
+                      mountPath: /etc/otelcol-contrib
+              volumes:
+                - name: config
+                  configMap:
+                    name: otel-collector-config
+        ```
+      </Tab>
+      <Tab title="Helm">
+        ```bash
+        helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
+        helm install otel-collector open-telemetry/opentelemetry-collector \
+          --set config.receivers.otlp.protocols.http.endpoint=0.0.0.0:4318 \
+          --set config.exporters.prometheus.endpoint=0.0.0.0:8889
+        ```
+      </Tab>
+    </Tabs>
 
-1. **Enable OTLP export in Infisical**:
+  </Tab>
-
+</Tabs>
-   ```bash
-   OTEL_TELEMETRY_COLLECTION_ENABLED=true
-   OTEL_EXPORT_TYPE=otlp
-   OTEL_EXPORT_OTLP_ENDPOINT=http://otel-collector:4318/v1/metrics
-   OTEL_COLLECTOR_BASIC_AUTH_USERNAME=infisical
-   OTEL_COLLECTOR_BASIC_AUTH_PASSWORD=infisical
-   OTEL_OTLP_PUSH_INTERVAL=30000
-   ```
-
-2. **Create OpenTelemetry Collector configuration** (`otel-collector-config.yaml`):
-
-   ```yaml
-   extensions:
-     health_check:
-     pprof:
-     zpages:
-     basicauth/server:
-       htpasswd:
-         inline: |
-           your_username:your_password
-
-   receivers:
-     otlp:
-       protocols:
-         http:
-           endpoint: 0.0.0.0:4318
-           auth:
-             authenticator: basicauth/server
-
-     prometheus:
-       config:
-         scrape_configs:
-           - job_name: otel-collector
-             scrape_interval: 30s
-             static_configs:
-               - targets: [infisical-backend:9464]
-             metric_relabel_configs:
-               - action: labeldrop
-                 regex: "service_instance_id|service_name"
-
-   processors:
-     batch:
-
-   exporters:
-     prometheus:
-       endpoint: "0.0.0.0:8889"
-       auth:
-         authenticator: basicauth/server
-       resource_to_telemetry_conversion:
-         enabled: true
-
-   service:
-     extensions: [basicauth/server, health_check, pprof, zpages]
-     pipelines:
-       metrics:
-         receivers: [otlp]
-         processors: [batch]
-         exporters: [prometheus]
-   ```
-
-   **Important**: Replace `your_username:your_password` with your chosen credentials. These must match the values you set in Infisical's `OTEL_COLLECTOR_BASIC_AUTH_USERNAME` and `OTEL_COLLECTOR_BASIC_AUTH_PASSWORD` environment variables.
-
-3. **Create Prometheus configuration** for the collector:
-
-   ```yaml
-   global:
-     scrape_interval: 30s
-     evaluation_interval: 30s
-
-   scrape_configs:
-     - job_name: "otel-collector"
-       scrape_interval: 30s
-       static_configs:
-         - targets: ["otel-collector:8889"] # Adjust hostname/port based on your deployment
-       metrics_path: "/metrics"
-   ```
-
-   **Note**: Replace `otel-collector:8889` with the actual hostname and port where your OpenTelemetry Collector is running. This could be:
-
-   - **Docker Compose**: `otel-collector:8889` (service name)
-   - **Kubernetes**: `otel-collector.default.svc.cluster.local:8889` (service name)
-   - **Bare Metal**: `192.168.1.100:8889` (actual IP address)
-   - **Cloud**: `your-collector.example.com:8889` (domain name)
-
-### Deployment Options
-
-#### Docker Compose
-
-```yaml
-services:
-  otel-collector:
-    image: otel/opentelemetry-collector-contrib:latest
-    ports:
-      - 4318:4318 # OTLP http receiver
-      - 8889:8889 # Prometheus exporter metrics
-    volumes:
-      - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml:ro
-    command:
-      - "--config=/etc/otelcol-contrib/config.yaml"
-```
-
-#### Kubernetes
-
-```yaml
-# otel-collector-deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: otel-collector
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: otel-collector
-  template:
-    metadata:
-      labels:
-        app: otel-collector
-    spec:
-      containers:
-        - name: otel-collector
-          image: otel/opentelemetry-collector-contrib:latest
-          ports:
-            - containerPort: 4318
-            - containerPort: 8889
-          volumeMounts:
-            - name: config
-              mountPath: /etc/otelcol-contrib
-      volumes:
-        - name: config
-          configMap:
-            name: otel-collector-config
-```
-
-#### Helm
-
-```bash
-helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
-helm install otel-collector open-telemetry/opentelemetry-collector \
-  --set config.receivers.otlp.protocols.http.endpoint=0.0.0.0:4318 \
-  --set config.exporters.prometheus.endpoint=0.0.0.0:8889
-```
 
 ## Available Metrics
 
@@ -327,166 +346,211 @@ Infisical exposes the following key metrics in OpenTelemetry format:
 
 These metrics track all HTTP API requests to Infisical, including request counts, latency, and errors. Use these to monitor overall API health, identify performance bottlenecks, and track usage patterns across users and machine identities.
 
-#### Total API Requests
+<AccordionGroup>
+  <Accordion title="Total API Requests">
+    **Metric Name**: `infisical.http.server.request.count`
 
-- **Metric Name**: `infisical.http.server.request.count`
+    **Type**: Counter
-- **Type**: Counter
-- **Unit**: `{request}`
-- **Description**: Total number of API requests to Infisical (covers both human users and machine identities)
-- **Attributes**:
-  - `infisical.organization.id` (string): Organization ID
-  - `infisical.organization.name` (string): Organization name (e.g., "Platform Engineering Team")
-  - `infisical.user.id` (string, optional): User ID if human user
-  - `infisical.user.email` (string, optional): User email (e.g., "[email protected]")
-  - `infisical.identity.id` (string, optional): Machine identity ID
-  - `infisical.identity.name` (string, optional): Machine identity name (e.g., "prod-k8s-operator")
-  - `infisical.auth.method` (string, optional): Auth method used
-  - `http.request.method` (string): HTTP method (GET, POST, PUT, DELETE)
-  - `http.route` (string): API endpoint route pattern
-  - `http.response.status_code` (int): HTTP status code
-  - `infisical.project.id` (string, optional): Project ID
-  - `infisical.project.name` (string, optional): Project name
-  - `user_agent.original` (string, optional): User agent string
-  - `client.address` (string, optional): IP address
 
-#### Request Duration
+    **Unit**: `{request}`
 
-- **Metric Name**: `infisical.http.server.request.duration`
+    **Description**: Total number of API requests to Infisical (covers both human users and machine identities)
-- **Type**: Histogram
-- **Unit**: `s` (seconds)
-- **Description**: API request latency
-- **Buckets**: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10]
-- **Attributes**:
-  - `infisical.organization.id` (string): Organization ID
-  - `infisical.organization.name` (string): Organization name
-  - `infisical.user.id` (string, optional): User ID if human user
-  - `infisical.user.email` (string, optional): User email
-  - `infisical.identity.id` (string, optional): Machine identity ID
-  - `infisical.identity.name` (string, optional): Machine identity name
-  - `http.request.method` (string): HTTP method
-  - `http.route` (string): API endpoint route pattern
-  - `http.response.status_code` (int): HTTP status code
-  - `infisical.project.id` (string, optional): Project ID
-  - `infisical.project.name` (string, optional): Project name
 
-#### API Errors by Actor
+    **Attributes**:
+      - `infisical.organization.id` (string): Organization ID
+      - `infisical.organization.name` (string): Organization name (e.g., "Platform Engineering Team")
+      - `infisical.user.id` (string, optional): User ID if human user
+      - `infisical.user.email` (string, optional): User email (e.g., "[email protected]")
+      - `infisical.identity.id` (string, optional): Machine identity ID
+      - `infisical.identity.name` (string, optional): Machine identity name (e.g., "prod-k8s-operator")
+      - `infisical.auth.method` (string, optional): Auth method used
+      - `http.request.method` (string): HTTP method (GET, POST, PUT, DELETE)
+      - `http.route` (string): API endpoint route pattern
+      - `http.response.status_code` (int): HTTP status code
+      - `infisical.project.id` (string, optional): Project ID
+      - `infisical.project.name` (string, optional): Project name
+      - `user_agent.original` (string, optional): User agent string
+      - `client.address` (string, optional): IP address
+  </Accordion>
 
-- **Metric Name**: `infisical.http.server.error.count`
+  <Accordion title="Request Duration">
-- **Type**: Counter
+    **Metric Name**: `infisical.http.server.request.duration`
-- **Unit**: `{error}`
+
-- **Description**: API errors grouped by actor (for identifying misconfigured services)
+    **Type**: Histogram
-- **Attributes**:
+
-  - `infisical.organization.id` (string): Organization ID
+    **Unit**: `s` (seconds)
-  - `infisical.organization.name` (string): Organization name
+
-  - `infisical.user.id` (string, optional): User ID if human
+    **Description**: API request latency
-  - `infisical.user.email` (string, optional): User email
+
-  - `infisical.identity.id` (string, optional): Identity ID if machine
+    **Buckets**: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10]
-  - `infisical.identity.name` (string, optional): Identity name
+
-  - `http.route` (string): API endpoint where error occurred
+    **Attributes**:
-  - `http.request.method` (string): HTTP method
+      - `infisical.organization.id` (string): Organization ID
-  - `error.type` (string): Error category/type (client_error, server_error, auth_error, rate_limit_error, etc.)
+      - `infisical.organization.name` (string): Organization name
-  - `infisical.project.id` (string, optional): Project ID
+      - `infisical.user.id` (string, optional): User ID if human user
-  - `infisical.project.name` (string, optional): Project name
+      - `infisical.user.email` (string, optional): User email
-  - `client.address` (string, optional): IP address
+      - `infisical.identity.id` (string, optional): Machine identity ID
-  - `user_agent.original` (string, optional): User agent information
+      - `infisical.identity.name` (string, optional): Machine identity name
+      - `http.request.method` (string): HTTP method
+      - `http.route` (string): API endpoint route pattern
+      - `http.response.status_code` (int): HTTP status code
+      - `infisical.project.id` (string, optional): Project ID
+      - `infisical.project.name` (string, optional): Project name
+  </Accordion>
+
+  <Accordion title="API Errors by Actor">
+    **Metric Name**: `infisical.http.server.error.count`
+    
+    **Type**: Counter
+    
+    **Unit**: `{error}`
+    
+    **Description**: API errors grouped by actor (for identifying misconfigured services)
+    
+    **Attributes**:
+      - `infisical.organization.id` (string): Organization ID
+      - `infisical.organization.name` (string): Organization name
+      - `infisical.user.id` (string, optional): User ID if human
+      - `infisical.user.email` (string, optional): User email
+      - `infisical.identity.id` (string, optional): Identity ID if machine
+      - `infisical.identity.name` (string, optional): Identity name
+      - `http.route` (string): API endpoint where error occurred
+      - `http.request.method` (string): HTTP method
+      - `error.type` (string): Error category/type (client_error, server_error, auth_error, rate_limit_error, etc.)
+      - `infisical.project.id` (string, optional): Project ID
+      - `infisical.project.name` (string, optional): Project name
+      - `client.address` (string, optional): IP address
+      - `user_agent.original` (string, optional): User agent information
+  </Accordion>
+</AccordionGroup>
 
 ### Secret Operations Metrics
 
 These metrics provide visibility into secret access patterns, helping you understand which secrets are being accessed, by whom, and from where. Essential for security auditing and access pattern analysis.
 
-#### Secret Read Operations
+<AccordionGroup>
-
+  <Accordion title="Secret Read Operations">
-- **Metric Name**: `infisical.secret.read.count`
+    **Metric Name**: `infisical.secret.read.count`
-- **Type**: Counter
+    
-- **Unit**: `{operation}`
+    **Type**: Counter
-- **Description**: Number of secret read operations
+    
-- **Attributes**:
+    **Unit**: `{operation}`
-  - `infisical.organization.id` (string): Organization ID
+    
-  - `infisical.organization.name` (string): Organization name
+    **Description**: Number of secret read operations
-  - `infisical.project.id` (string): Project ID
+    
-  - `infisical.project.name` (string): Project name (e.g., "payment-service-secrets")
+    **Attributes**:
-  - `infisical.environment` (string): Environment (dev, staging, prod)
+      - `infisical.organization.id` (string): Organization ID
-  - `infisical.secret.path` (string): Path to secrets (e.g., "/microservice-a/database")
+      - `infisical.organization.name` (string): Organization name
-  - `infisical.secret.name` (string, optional): Name of secret
+      - `infisical.project.id` (string): Project ID
-  - `infisical.user.id` (string, optional): User ID if human
+      - `infisical.project.name` (string): Project name (e.g., "payment-service-secrets")
-  - `infisical.user.email` (string, optional): User email
+      - `infisical.environment` (string): Environment (dev, staging, prod)
-  - `infisical.identity.id` (string, optional): Machine identity ID
+      - `infisical.secret.path` (string): Path to secrets (e.g., "/microservice-a/database")
-  - `infisical.identity.name` (string, optional): Machine identity name
+      - `infisical.secret.name` (string, optional): Name of secret
-  - `user_agent.original` (string, optional): User agent/SDK information
+      - `infisical.user.id` (string, optional): User ID if human
-  - `client.address` (string, optional): IP address
+      - `infisical.user.email` (string, optional): User email
+      - `infisical.identity.id` (string, optional): Machine identity ID
+      - `infisical.identity.name` (string, optional): Machine identity name
+      - `user_agent.original` (string, optional): User agent/SDK information
+      - `client.address` (string, optional): IP address
+  </Accordion>
+</AccordionGroup>
 
 ### Authentication Metrics
 
 These metrics track authentication attempts and outcomes, enabling you to monitor login success rates, detect potential security threats, and identify authentication issues.
 
-#### Login Attempts
+<AccordionGroup>
-
+  <Accordion title="Login Attempts">
-- **Metric Name**: `infisical.auth.attempt.count`
+    **Metric Name**: `infisical.auth.attempt.count`
-- **Type**: Counter
+    
-- **Unit**: `{attempt}`
+    **Type**: Counter
-- **Description**: Authentication attempts (both successful and failed)
+    
-- **Attributes**:
+    **Unit**: `{attempt}`
-  - `infisical.organization.id` (string): Organization ID
+    
-  - `infisical.organization.name` (string): Organization name
+    **Description**: Authentication attempts (both successful and failed)
-  - `infisical.user.id` (string, optional): User ID if human (if identifiable)
+    
-  - `infisical.user.email` (string, optional): User email (if identifiable)
+    **Attributes**:
-  - `infisical.identity.id` (string, optional): Identity ID if machine (if identifiable)
+      - `infisical.organization.id` (string): Organization ID
-  - `infisical.identity.name` (string, optional): Identity name (if identifiable)
+      - `infisical.organization.name` (string): Organization name
-  - `infisical.auth.method` (string): Authentication method attempted
+      - `infisical.user.id` (string, optional): User ID if human (if identifiable)
-  - `infisical.auth.result` (string): success or failure
+      - `infisical.user.email` (string, optional): User email (if identifiable)
-  - `error.type` (string, optional): Reason for failure if failed (invalid_credentials, expired_token, invalid_token, etc.)
+      - `infisical.identity.id` (string, optional): Identity ID if machine (if identifiable)
-  - `client.address` (string): IP address
+      - `infisical.identity.name` (string, optional): Identity name (if identifiable)
-  - `user_agent.original` (string, optional): User agent/client information
+      - `infisical.auth.method` (string): Authentication method attempted
-  - `infisical.auth.attempt.username` (string, optional): Attempted username/email (if available)
+      - `infisical.auth.result` (string): success or failure
-
+      - `error.type` (string, optional): Reason for failure if failed (invalid_credentials, expired_token, invalid_token, etc.)
-### Legacy Metrics
+      - `client.address` (string): IP address
-
+      - `user_agent.original` (string, optional): User agent/client information
-These metrics are from the previous instrumentation and may be deprecated in future versions. Consider migrating to the new Core API Metrics for more comprehensive observability.
+      - `infisical.auth.attempt.username` (string, optional): Attempted username/email (if available)
-
+  </Accordion>
-- `API_latency` - API request latency histogram in milliseconds (Labels: `route`, `method`, `statusCode`)
+</AccordionGroup>
-- `API_errors` - API error count histogram (Labels: `route`, `method`, `type`, `name`)
 
 ### Integration & Secret Sync Metrics
 
 These metrics monitor secret synchronization operations between Infisical and external systems, helping you track sync health, identify integration failures, and troubleshoot connectivity issues.
 
-- `integration_secret_sync_errors` - Integration secret sync error count
+<AccordionGroup>
+  <Accordion title="integration_secret_sync_errors">
+    Integration secret sync error count
 
-  - **Labels**: `version`, `integration`, `integrationId`, `type`, `status`, `name`, `projectId`
+    - **Labels**: `version`, `integration`, `integrationId`, `type`, `status`, `name`, `projectId`
-  - **Example**: Monitor integration sync failures across different services
+    - **Example**: Monitor integration sync failures across different services
+  </Accordion>
 
-- `secret_sync_sync_secrets_errors` - Secret sync operation error count
+  <Accordion title="secret_sync_sync_secrets_errors">
+    Secret sync operation error count
 
-  - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
+    - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
-  - **Example**: Track secret sync failures to external systems
+    - **Example**: Track secret sync failures to external systems
+  </Accordion>
 
-- `secret_sync_import_secrets_errors` - Secret import operation error count
+  <Accordion title="secret_sync_import_secrets_errors">
+    Secret import operation error count
 
-  - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
+    - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
-  - **Example**: Monitor secret import failures
+    - **Example**: Monitor secret import failures
+  </Accordion>
 
-- `secret_sync_remove_secrets_errors` - Secret removal operation error count
+  <Accordion title="secret_sync_remove_secrets_errors">
-  - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
+    Secret removal operation error count
-  - **Example**: Track secret removal operation failures
+    
+    - **Labels**: `version`, `destination`, `syncId`, `projectId`, `type`, `status`, `name`
+    - **Example**: Track secret removal operation failures
+  </Accordion>
+</AccordionGroup>
 
 ### System Metrics
 
 These low-level HTTP metrics are automatically collected by OpenTelemetry's instrumentation layer, providing baseline performance data for all HTTP traffic.
 
-- `http_server_duration` - HTTP server request duration metrics (histogram buckets, count, sum)
+<AccordionGroup>
-- `http_client_duration` - HTTP client request duration metrics (histogram buckets, count, sum)
+  <Accordion title="http_server_duration">
+    HTTP server request duration metrics (histogram buckets, count, sum)
+  </Accordion>
+  
+  <Accordion title="http_client_duration">
+    HTTP client request duration metrics (histogram buckets, count, sum)
+  </Accordion>
+</AccordionGroup>
 
 ## Troubleshooting
 
-### Common Issues
+<Accordion title="Metrics not appearing">
+  If your metrics are not showing up in Prometheus or your monitoring system, check the following:
 
-1. **Metrics not appearing**:
+  - Verify `OTEL_TELEMETRY_COLLECTION_ENABLED=true` is set in your Infisical environment variables
+  - Ensure the correct `OTEL_EXPORT_TYPE` is set (`prometheus` or `otlp`)
+  - Check network connectivity between Infisical and your monitoring services (Prometheus or OTLP collector)
+  - For pull-based monitoring: Verify port 9464 is exposed and accessible
+  - For push-based monitoring: Verify the OTLP endpoint URL is correct and reachable
+  - Check Infisical backend logs for any errors related to metrics export
+</Accordion>
 
-   - Check if `OTEL_TELEMETRY_COLLECTION_ENABLED=true`
+<Accordion title="Authentication errors">
-   - Verify the correct `OTEL_EXPORT_TYPE` is set
+  If you're experiencing authentication errors with the OpenTelemetry Collector:
-   - Check network connectivity between services
 
-2. **Authentication errors**:
+  - Verify basic auth credentials in your OTLP configuration match between Infisical and the collector
-
+  - Check that `OTEL_COLLECTOR_BASIC_AUTH_USERNAME` and `OTEL_COLLECTOR_BASIC_AUTH_PASSWORD` match the credentials in your `otel-collector-config.yaml`
-   - Verify basic auth credentials in OTLP configuration
+  - Ensure the htpasswd format in the collector configuration is correct
-   - Check if credentials match between Infisical and collector
+  - Test the collector endpoint manually using curl with the same credentials to verify they work
+</Accordion>

frontend/src/components/features/WishForm.tsx

@@ -35,23 +35,16 @@ export const WishForm = () => {
   const [isOpen, setIsOpen] = useToggle(false);
 
   const createWish = async (data: TFormData) => {
-    try {
+    await mutateAsync({
-      await mutateAsync({
+      text: data.text
-        text: data.text
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: "Your wish has been sent to the Infisical team!",
+      text: "Your wish has been sent to the Infisical team!",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      setIsOpen.off();
+    setIsOpen.off();
-    } catch {
-      createNotification({
-        text: "An error occured while sending your wish to the Infisical team.",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/mfa/TotpRegistration.tsx

@@ -25,27 +25,20 @@ const TotpRegistration = ({ onComplete, shouldCenterQr }: Props) => {
 
   const handleTotpVerify = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    try {
+    const result = await verifyUserTotp({
-      const result = await verifyUserTotp({
+      totp
-        totp
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: "Successfully configured mobile authenticator",
+      text: "Successfully configured mobile authenticator",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      if (result.recoveryCodes && result.recoveryCodes.length > 0) {
+    if (result.recoveryCodes && result.recoveryCodes.length > 0) {
-        setRecoveryCodes(result.recoveryCodes);
+      setRecoveryCodes(result.recoveryCodes);
-        setShowRecoveryModal(true);
+      setShowRecoveryModal(true);
-      } else if (onComplete) {
+    } else if (onComplete) {
-        onComplete();
+      onComplete();
-      }
-    } catch {
-      createNotification({
-        text: "Failed to verify TOTP code",
-        type: "error"
-      });
     }
   };
 

frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx

@@ -43,35 +43,27 @@ export const CreateOrgModal: FC<CreateOrgModalProps> = ({ isOpen, onClose }) =>
   const { mutateAsync: selectOrg } = useSelectOrganization();
 
   const onFormSubmit = async ({ name }: FormData) => {
-    try {
+    const organization = await createOrg({
-      const organization = await createOrg({
+      name
-        name
+    });
-      });
 
-      await selectOrg({
+    await selectOrg({
-        organizationId: organization.id
+      organizationId: organization.id
-      });
+    });
 
-      createNotification({
+    createNotification({
-        text: "Successfully created organization",
+      text: "Successfully created organization",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      navigate({
+    navigate({
-        to: "/organization/projects"
+      to: "/organization/projects"
-      });
+    });
 
-      localStorage.setItem("orgData.id", organization.id);
+    localStorage.setItem("orgData.id", organization.id);
 
-      reset();
+    reset();
-      onClose();
+    onClose();
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to created organization",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/pki-syncs/DeletePkiSyncModal.tsx

@@ -20,28 +20,19 @@ export const DeletePkiSyncModal = ({ isOpen, onOpenChange, pkiSync, onComplete }
   const handleDeletePkiSync = async () => {
     const destinationName = PKI_SYNC_MAP[destination].name;
 
-    try {
+    await deleteSync.mutateAsync({
-      await deleteSync.mutateAsync({
+      syncId,
-        syncId,
+      projectId,
-        projectId,
+      destination
-        destination
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully deleted ${destinationName} PKI Sync`,
+      text: `Successfully deleted ${destinationName} PKI Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      if (onComplete) onComplete();
+    if (onComplete) onComplete();
-      onOpenChange(false);
+    onOpenChange(false);
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to delete ${destinationName} PKI Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/pki-syncs/PkiSyncImportCertificatesModal.tsx

@@ -21,27 +21,18 @@ const Content = ({ pkiSync, onComplete }: ContentProps) => {
   const triggerImportCertificates = useTriggerPkiSyncImportCertificates();
 
   const handleTriggerImportCertificates = async () => {
-    try {
+    await triggerImportCertificates.mutateAsync({
-      await triggerImportCertificates.mutateAsync({
+      syncId,
-        syncId,
+      destination,
-        destination,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully triggered certificate import for ${destinationName} Sync`,
+      text: `Successfully triggered certificate import for ${destinationName} Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      onComplete();
+    onComplete();
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to trigger certificate import for ${destinationName} Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/pki-syncs/PkiSyncRemoveCertificatesModal.tsx

@@ -21,27 +21,18 @@ const Content = ({ pkiSync, onComplete }: ContentProps) => {
   const triggerRemoveCertificates = useTriggerPkiSyncRemoveCertificates();
 
   const handleTriggerRemoveCertificates = async () => {
-    try {
+    await triggerRemoveCertificates.mutateAsync({
-      await triggerRemoveCertificates.mutateAsync({
+      syncId,
-        syncId,
+      destination,
-        destination,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully triggered certificate removal for ${destinationName} Sync`,
+      text: `Successfully triggered certificate removal for ${destinationName} Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      onComplete();
+    onComplete();
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to trigger certificate removal for ${destinationName} Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/pki-syncs/forms/CreatePkiSyncForm.tsx

@@ -86,14 +86,8 @@ export const CreatePkiSyncForm = ({ destination, onComplete, onCancel, initialDa
         type: "success"
       });
       onComplete(pkiSync);
-    } catch (err: Error | unknown) {
+    } catch {
-      console.error("PKI sync creation failed:", err);
       setShowConfirmation(false);
-      createNotification({
-        title: `Failed to create ${destinationName} Certificate Sync`,
-        text: err instanceof Error ? err.message : "An unknown error occurred",
-        type: "error"
-      });
     }
   };
 

frontend/src/components/pki-syncs/forms/EditPkiSyncForm.tsx

@@ -42,28 +42,19 @@ export const EditPkiSyncForm = ({ pkiSync, fields, onComplete }: Props) => {
   });
 
   const onSubmit = async ({ connection, ...formData }: TUpdatePkiSyncForm) => {
-    try {
+    const updatedPkiSync = await updatePkiSync.mutateAsync({
-      const updatedPkiSync = await updatePkiSync.mutateAsync({
+      syncId: pkiSync.id,
-        syncId: pkiSync.id,
+      ...formData,
-        ...formData,
+      connectionId: connection.id,
-        connectionId: connection.id,
+      projectId: pkiSync.projectId,
-        projectId: pkiSync.projectId,
+      destination: pkiSync.destination
-        destination: pkiSync.destination
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully updated ${destinationName} PKI Sync`,
+      text: `Successfully updated ${destinationName} PKI Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
-      onComplete(updatedPkiSync);
+    onComplete(updatedPkiSync);
-    } catch (err: any) {
-      console.error(err);
-      createNotification({
-        title: `Failed to update ${destinationName} PKI Sync`,
-        text: err.message,
-        type: "error"
-      });
-    }
   };
 
   let Component: ReactNode;

frontend/src/components/project/ProjectOverviewChangeSection.tsx

@@ -56,30 +56,22 @@ export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) =
   }, [currentProject, showSlugField]);
 
   const onFormSubmit = async (data: BaseFormData | FormDataWithSlug) => {
-    try {
+    if (!currentProject?.id) return;
-      if (!currentProject?.id) return;
 
-      await mutateAsync({
+    await mutateAsync({
-        projectId: currentProject.id,
+      projectId: currentProject.id,
-        newProjectName: data.name,
+      newProjectName: data.name,
-        newProjectDescription: data.description,
+      newProjectDescription: data.description,
-        ...(showSlugField &&
+      ...(showSlugField &&
-          "slug" in data && {
+        "slug" in data && {
-            newSlug: data.slug !== currentProject.slug ? data.slug : undefined
+          newSlug: data.slug !== currentProject.slug ? data.slug : undefined
-          })
+        })
-      });
+    });
 
-      createNotification({
+    createNotification({
-        text: "Successfully updated project overview",
+      text: "Successfully updated project overview",
-        type: "success"
+      type: "success"
-      });
+    });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to update project overview",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/projects/NewProjectModal.tsx

@@ -141,29 +141,24 @@ const NewProjectForm = ({ onOpenChange }: NewProjectFormProps) => {
     // type check
     if (!currentOrg) return;
     if (!user) return;
-    try {
+    const {
-      const {
+      data: { project }
-        data: { project }
+    } = await createWs.mutateAsync({
-      } = await createWs.mutateAsync({
+      projectName: name,
-        projectName: name,
+      projectDescription: description,
-        projectDescription: description,
+      kmsKeyId: kmsKeyId !== INTERNAL_KMS_KEY_ID ? kmsKeyId : undefined,
-        kmsKeyId: kmsKeyId !== INTERNAL_KMS_KEY_ID ? kmsKeyId : undefined,
+      template,
-        template,
+      type
-        type
+    });
-      });
+    await refetchWorkspaces();
-      await refetchWorkspaces();
 
-      createNotification({ text: "Project created", type: "success" });
+    createNotification({ text: "Project created", type: "success" });
-      reset();
+    reset();
-      onOpenChange(false);
+    onOpenChange(false);
-      navigate({
+    navigate({
-        to: getProjectHomePage(project.type, project.environments),
+      to: getProjectHomePage(project.type, project.environments),
-        params: { projectId: project.id }
+      params: { projectId: project.id }
-      });
+    });
-    } catch (err) {
-      console.error(err);
-      createNotification({ text: "Failed to create project", type: "error" });
-    }
   };
   const onSubmit = handleSubmit((data) => {
     return onCreateProject(data);

frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx

@@ -37,29 +37,22 @@ export const DeleteSecretRotationV2Modal = ({
   const handleDeleteSecretRotation = async () => {
     const rotationType = SECRET_ROTATION_MAP[type].name;
 
-    try {
+    await deleteSecretRotation.mutateAsync({
-      await deleteSecretRotation.mutateAsync({
+      rotationId,
-        rotationId,
+      type,
-        type,
+      revokeGeneratedCredentials,
-        revokeGeneratedCredentials,
+      deleteSecrets,
-        deleteSecrets,
+      projectId,
-        projectId,
+      secretPath: folder.path
-        secretPath: folder.path
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully deleted ${rotationType} Rotation`,
+      text: `Successfully deleted ${rotationType} Rotation`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      if (onComplete) onComplete();
+    if (onComplete) onComplete();
-      onOpenChange(false);
+    onOpenChange(false);
-    } catch {
-      createNotification({
-        text: `Failed to delete ${rotationType} Rotation`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-rotations-v2/RotateSecretRotationV2Modal.tsx

@@ -22,28 +22,19 @@ const Content = ({ secretRotation, onComplete }: ContentProps) => {
   const rotationType = SECRET_ROTATION_MAP[type].name;
 
   const handleRotateSecrets = async () => {
-    try {
+    await rotateSecrets.mutateAsync({
-      await rotateSecrets.mutateAsync({
+      rotationId,
-        rotationId,
+      type,
-        type,
+      projectId,
-        projectId,
+      secretPath: folder.path
-        secretPath: folder.path
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully rotated ${rotationType} secrets`,
+      text: `Successfully rotated ${rotationType} secrets`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      onComplete();
+    onComplete();
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to rotate ${rotationType} secrets`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-rotations-v2/forms/SecretRotationV2Form.tsx

@@ -120,21 +120,13 @@ export const SecretRotationV2Form = ({
           environment: environment.slug,
           projectId: currentProject.id
         });
-    try {
+    const rotation = await mutation;
-      const rotation = await mutation;
 
-      createNotification({
+    createNotification({
-        text: `Successfully ${secretRotation ? "updated" : "created"} ${rotationType} Rotation`,
+      text: `Successfully ${secretRotation ? "updated" : "created"} ${rotationType} Rotation`,
-        type: "success"
+      type: "success"
-      });
+    });
-      onComplete(rotation);
+    onComplete(rotation);
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${secretRotation ? "update" : "create"} ${rotationType} Rotation`,
-        text: err.message,
-        type: "error"
-      });
-    }
   };
 
   const handlePrev = () => {

frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx

@@ -28,26 +28,19 @@ export const DeleteSecretScanningDataSourceModal = ({
   const handleDeleteDataSource = async () => {
     const dataSourceType = SECRET_SCANNING_DATA_SOURCE_MAP[type].name;
 
-    try {
+    await deleteDataSource.mutateAsync({
-      await deleteDataSource.mutateAsync({
+      dataSourceId,
-        dataSourceId,
+      type,
-        type,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully deleted ${dataSourceType} Data Source`,
+      text: `Successfully deleted ${dataSourceType} Data Source`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      if (onComplete) onComplete();
+    if (onComplete) onComplete();
-      onOpenChange(false);
+    onOpenChange(false);
-    } catch {
-      createNotification({
-        text: `Failed to delete ${dataSourceType} Data Source`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx

@@ -73,21 +73,13 @@ export const SecretScanningDataSourceForm = ({
           connectionId: connection?.id,
           projectId: currentProject.id
         });
-    try {
+    const source = await mutation;
-      const source = await mutation;
 
-      createNotification({
+    createNotification({
-        text: `Successfully ${source ? "updated" : "created"} ${sourceType} Data Source`,
+      text: `Successfully ${source ? "updated" : "created"} ${sourceType} Data Source`,
-        type: "success"
+      type: "success"
-      });
+    });
-      onComplete(source);
+    onComplete(source);
-    } catch (err: any) {
-      createNotification({
-        title: `Failed to ${dataSource ? "update" : "create"} ${sourceType} Data Source`,
-        text: err.message,
-        type: "error"
-      });
-    }
   };
 
   const handlePrev = () => {

frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx

@@ -23,29 +23,20 @@ export const DeleteSecretSyncModal = ({ isOpen, onOpenChange, secretSync, onComp
   const handleDeleteSecretSync = async () => {
     const destinationName = SECRET_SYNC_MAP[destination].name;
 
-    try {
+    await deleteSync.mutateAsync({
-      await deleteSync.mutateAsync({
+      syncId,
-        syncId,
+      destination,
-        destination,
+      removeSecrets,
-        removeSecrets,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully removed ${destinationName} Sync`,
+      text: `Successfully removed ${destinationName} Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      if (onComplete) onComplete();
+    if (onComplete) onComplete();
-      onOpenChange(false);
+    onOpenChange(false);
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to remove ${destinationName} Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-syncs/SecretSyncImportSecretsModal.tsx

@@ -51,28 +51,19 @@ const Content = ({ secretSync, onComplete }: ContentProps) => {
   const triggerImportSecrets = useTriggerSecretSyncImportSecrets();
 
   const handleTriggerImportSecrets = async ({ importBehavior }: TFormData) => {
-    try {
+    await triggerImportSecrets.mutateAsync({
-      await triggerImportSecrets.mutateAsync({
+      syncId,
-        syncId,
+      destination,
-        destination,
+      importBehavior,
-        importBehavior,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully triggered secret import for ${destinationName} Sync`,
+      text: `Successfully triggered secret import for ${destinationName} Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      onComplete();
+    onComplete();
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to trigger secret import for ${destinationName} Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-syncs/SecretSyncRemoveSecretsModal.tsx

@@ -21,27 +21,18 @@ const Content = ({ secretSync, onComplete }: ContentProps) => {
   const triggerSyncImport = useTriggerSecretSyncRemoveSecrets();
 
   const handleTriggerRemoveSecrets = async () => {
-    try {
+    await triggerSyncImport.mutateAsync({
-      await triggerSyncImport.mutateAsync({
+      syncId,
-        syncId,
+      destination,
-        destination,
+      projectId
-        projectId
+    });
-      });
 
-      createNotification({
+    createNotification({
-        text: `Successfully triggered secret removal for ${destinationName} Sync`,
+      text: `Successfully triggered secret removal for ${destinationName} Sync`,
-        type: "success"
+      type: "success"
-      });
+    });
 
-      onComplete();
+    onComplete();
-    } catch (err) {
-      console.error(err);
-
-      createNotification({
-        text: `Failed to trigger secret removal for ${destinationName} Sync`,
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/secret-syncs/forms/CreateSecretSyncForm.tsx

@@ -88,14 +88,8 @@ export const CreateSecretSyncForm = ({
         type: "success"
       });
       onComplete(secretSync);
-    } catch (err: any) {
+    } catch {
-      console.error(err);
       setShowConfirmation(false);
-      createNotification({
-        title: `Failed to add ${destinationName} Sync`,
-        text: err.message,
-        type: "error"
-      });
     }
   };
 

frontend/src/components/secret-syncs/forms/EditSecretSyncForm.tsx

@@ -58,29 +58,20 @@ export const EditSecretSyncForm = ({ secretSync, fields, onComplete }: Props) =>
 
   const performUpdate = useCallback(
     async (formData: TSecretSyncForm) => {
-      try {
+      const { environment, connection, ...updateData } = formData;
-        const { environment, connection, ...updateData } = formData;
+      const updatedSecretSync = await updateSecretSync.mutateAsync({
-        const updatedSecretSync = await updateSecretSync.mutateAsync({
+        syncId: secretSync.id,
-          syncId: secretSync.id,
+        ...updateData,
-          ...updateData,
+        environment: environment?.slug,
-          environment: environment?.slug,
+        connectionId: connection.id,
-          connectionId: connection.id,
+        projectId: secretSync.projectId
-          projectId: secretSync.projectId
+      });
-        });
 
-        createNotification({
+      createNotification({
-          text: `Successfully updated ${destinationName} Sync`,
+        text: `Successfully updated ${destinationName} Sync`,
-          type: "success"
+        type: "success"
-        });
+      });
-        onComplete(updatedSecretSync);
+      onComplete(updatedSecretSync);
-      } catch (err: any) {
-        console.error(err);
-        createNotification({
-          title: `Failed to update ${destinationName} Sync`,
-          text: err.message,
-          type: "error"
-        });
-      }
     },
     [updateSecretSync, secretSync.id, secretSync.projectId, destinationName, onComplete]
   );

frontend/src/components/tags/CreateTagModal/CreateTagModal.tsx

@@ -130,26 +130,18 @@ export const CreateTagModal = ({ isOpen, onToggle, append, currentSecret }: Prop
   }, [isOpen]);
 
   const onFormSubmit = async ({ slug, color }: FormData) => {
-    try {
+    const data = await createWsTag({
-      const data = await createWsTag({
+      projectId,
-        projectId,
+      tagColor: color,
-        tagColor: color,
+      tagSlug: slug
-        tagSlug: slug
+    });
-      });
+    append(data);
-      append(data);
+    onToggle(false);
-      onToggle(false);
+    reset();
-      reset();
+    createNotification({
-      createNotification({
+      text: "Successfully created a tag",
-        text: "Successfully created a tag",
+      type: "success"
-        type: "success"
+    });
-      });
-    } catch (error) {
-      console.error(error);
-      createNotification({
-        text: "Failed to create a tag",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/components/v2/HighlightText/HighlightText.tsx

@@ -9,22 +9,10 @@ export const HighlightText = ({
 }) => {
   if (!text) return null;
 
-  const renderTextWithNewlines = (input: string, baseKeyPrefix: string = ""): React.ReactNode[] => {
-    if (!input) return [];
-    const lines = input.split("\n");
-    return lines.flatMap((line, index) => {
-      const nodes: React.ReactNode[] = [line];
-      if (index < lines.length - 1) {
-        nodes.push(<br key={`${baseKeyPrefix}-br-${line}`} />);
-      }
-      return nodes;
-    });
-  };
-
   const searchTerm = highlight.toLowerCase().trim();
 
   if (!searchTerm) {
-    return <span>{renderTextWithNewlines(text, "full-text")}</span>;
+    return <span>{text}</span>;
   }
 
   const parts: React.ReactNode[] = [];
@@ -36,16 +24,12 @@ export const HighlightText = ({
   text.replace(regex, (match: string, offset: number) => {
     if (offset > lastIndex) {
       const preMatchText = text.substring(lastIndex, offset);
-      parts.push(
+      parts.push(<span key={`pre-${lastIndex}`}>{preMatchText}</span>);
-        <span key={`pre-${lastIndex}`}>
-          {renderTextWithNewlines(preMatchText, `pre-${lastIndex}`)}
-        </span>
-      );
     }
 
     parts.push(
       <span key={`match-${offset}`} className={highlightClassName || "bg-yellow/30"}>
-        {renderTextWithNewlines(match, `match-${offset}`)}
+        {match}
       </span>
     );
 
@@ -56,11 +40,7 @@ export const HighlightText = ({
 
   if (lastIndex < text.length) {
     const postMatchText = text.substring(lastIndex);
-    parts.push(
+    parts.push(<span key={`post-${lastIndex}`}>{postMatchText}</span>);
-      <span key={`post-${lastIndex}`}>
-        {renderTextWithNewlines(postMatchText, `post-${lastIndex}`)}
-      </span>
-    );
   }
 
   return parts;

frontend/src/helpers/appConnections.ts

@@ -131,7 +131,7 @@ export const APP_CONNECTION_MAP: Record<
     image: "Laravel Forge.png",
     size: 65
   },
-  [AppConnection.Chef]: { name: "Chef", image: "Chef.png" }
+  [AppConnection.Chef]: { name: "Chef", image: "Chef.png", enterprise: true }
 };
 
 export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => {

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

@@ -159,8 +159,8 @@ export type TCreateCertificateDTO = {
   ttl: string; // string compatible with ms
   notBefore?: string;
   notAfter?: string;
-  keyUsages: CertKeyUsage[];
+  keyUsages: string[];
-  extendedKeyUsages: CertExtendedKeyUsage[];
+  extendedKeyUsages: string[];
 };
 
 export type TCreateCertificateResponse = {

frontend/src/hooks/api/certificateTemplates/mutations.tsx

@@ -90,7 +90,12 @@ export const useCreateCertTemplateV2 = () => {
       return data.certificateTemplate;
     },
     onSuccess: (_, { projectId }) => {
-      queryClient.invalidateQueries({ queryKey: certTemplateKeys.listTemplates({ projectId }) });
+      queryClient.invalidateQueries({
+        predicate: (query) => {
+          const [firstKey, queryProjectId] = query.queryKey;
+          return firstKey === "list-template" && queryProjectId === projectId;
+        }
+      });
     }
   });
 };
@@ -107,7 +112,12 @@ export const useUpdateCertTemplateV2 = () => {
       return data.certificateTemplate;
     },
     onSuccess: (_, { projectId }) => {
-      queryClient.invalidateQueries({ queryKey: certTemplateKeys.listTemplates({ projectId }) });
+      queryClient.invalidateQueries({
+        predicate: (query) => {
+          const [firstKey, queryProjectId] = query.queryKey;
+          return firstKey === "list-template" && queryProjectId === projectId;
+        }
+      });
     }
   });
 };
@@ -127,7 +137,12 @@ export const useDeleteCertTemplateV2 = () => {
       return data.certificateTemplate;
     },
     onSuccess: (_, { projectId }) => {
-      queryClient.invalidateQueries({ queryKey: certTemplateKeys.listTemplates({ projectId }) });
+      queryClient.invalidateQueries({
+        predicate: (query) => {
+          const [firstKey, queryProjectId] = query.queryKey;
+          return firstKey === "list-template" && queryProjectId === projectId;
+        }
+      });
     }
   });
 };

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

@@ -109,6 +109,7 @@ export type SecretVersions = {
     actorType?: string | null;
     name?: string | null;
     membershipId?: string | null;
+    groupId?: string | null;
   } | null;
 };
 

frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx

@@ -36,28 +36,21 @@ export const NewSubOrganizationForm = ({ onClose }: ContentProps) => {
   const router = useRouter();
 
   const onSubmit = async ({ name }: FormData) => {
-    try {
+    const { organization } = await createSubOrg.mutateAsync({
-      const { organization } = await createSubOrg.mutateAsync({
+      name
-        name
+    });
-      });
 
-      createNotification({
+    createNotification({
-        type: "success",
+      type: "success",
-        text: "Successfully created sub organization"
+      text: "Successfully created sub organization"
-      });
+    });
-      onClose();
+    onClose();
 
-      navigate({
+    navigate({
-        to: "/organization/projects",
+      to: "/organization/projects",
-        search: (prev) => ({ ...prev, subOrganization: organization.name })
+      search: (prev) => ({ ...prev, subOrganization: organization.name })
-      });
+    });
-      await router.invalidate({ sync: true }).catch(() => null);
+    await router.invalidate({ sync: true }).catch(() => null);
-    } catch {
-      createNotification({
-        text: "Failed to create sub organization",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx

@@ -11,7 +11,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Link, linkOptions } from "@tanstack/react-router";
 
 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
-import { createNotification } from "@app/components/notifications";
 import { OrgPermissionCan } from "@app/components/permissions";
 import { NewProjectModal } from "@app/components/projects";
 import {
@@ -59,31 +58,17 @@ export const ProjectSelect = () => {
   const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites();
 
   const addProjectToFavorites = async (projectId: string) => {
-    try {
+    await updateUserProjectFavorites({
-      await updateUserProjectFavorites({
+      orgId: currentOrg!.id,
-        orgId: currentOrg!.id,
+      projectFavorites: [...(projectFavorites || []), projectId]
-        projectFavorites: [...(projectFavorites || []), projectId]
+    });
-      });
-    } catch {
-      createNotification({
-        text: "Failed to add project to favorites.",
-        type: "error"
-      });
-    }
   };
 
   const removeProjectFromFavorites = async (projectId: string) => {
-    try {
+    await updateUserProjectFavorites({
-      await updateUserProjectFavorites({
+      orgId: currentOrg!.id,
-        orgId: currentOrg!.id,
+      projectFavorites: [...(projectFavorites || []).filter((entry) => entry !== projectId)]
-        projectFavorites: [...(projectFavorites || []).filter((entry) => entry !== projectId)]
+    });
-      });
-    } catch {
-      createNotification({
-        text: "Failed to remove project from favorites.",
-        type: "error"
-      });
-    }
   };
 
   const isAddingProjectsAllowed = subscription?.workspaceLimit

frontend/src/pages/admin/AccessManagementPage/components/AddServerAdminModal.tsx

@@ -65,20 +65,13 @@ const Content = ({ onClose }: ContentProps) => {
   const users = usersData.filter((user) => !user.superAdmin);
 
   const onSubmit = async ({ user }: FormData) => {
-    try {
+    await grantAdmin.mutateAsync(user.id);
-      await grantAdmin.mutateAsync(user.id);
 
-      createNotification({
+    createNotification({
-        type: "success",
+      type: "success",
-        text: "Successfully granted server admin status"
+      text: "Successfully granted server admin status"
-      });
+    });
-      onClose();
+    onClose();
-    } catch {
-      createNotification({
-        text: "Failed to grant server admin status",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/AccessManagementPage/components/ServerAdminsTable.tsx

@@ -303,18 +303,11 @@ export const ServerAdminsTable = () => {
   const handleRemoveUser = async () => {
     const { id } = popUp?.removeUser?.data as { id: string; username: string };
 
-    try {
+    await deleteUser(id);
-      await deleteUser(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully deleted user"
-        text: "Successfully deleted user"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error deleting user"
-      });
-    }
 
     handlePopUpClose("removeUser");
   };
@@ -322,39 +315,25 @@ export const ServerAdminsTable = () => {
   const handleRemoveServerAdminAccess = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; username: string };
 
-    try {
+    await removeAdminAccess(id);
-      await removeAdminAccess(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully removed server admin access from user"
-        text: "Successfully removed server admin access from user"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin access from user"
-      });
-    }
 
     handlePopUpClose("removeServerAdmin");
   };
 
   const handleRemoveUsers = async () => {
-    try {
+    await deleteUsers(selectedUsers.map((user) => user.id));
-      await deleteUsers(selectedUsers.map((user) => user.id));
 
-      createNotification({
+    createNotification({
-        text: "Successfully removed users",
+      text: "Successfully removed users",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      setSelectedUsers([]);
+    setSelectedUsers([]);
-      handlePopUpClose("removeUsers");
+    handlePopUpClose("removeUsers");
-    } catch {
-      createNotification({
-        text: "Failed to remove users",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/AuthenticationPage/components/AuthenticationPageForm.tsx

@@ -54,59 +54,51 @@ export const AuthenticationPageForm = () => {
   });
 
   const onAuthFormSubmit = async (formData: TAuthForm) => {
-    try {
+    const enabledMethods: LoginMethod[] = [];
-      const enabledMethods: LoginMethod[] = [];
+    if (formData.isEmailEnabled) {
-      if (formData.isEmailEnabled) {
+      enabledMethods.push(LoginMethod.EMAIL);
-        enabledMethods.push(LoginMethod.EMAIL);
+    }
-      }
 
-      if (formData.isGoogleEnabled) {
+    if (formData.isGoogleEnabled) {
-        enabledMethods.push(LoginMethod.GOOGLE);
+      enabledMethods.push(LoginMethod.GOOGLE);
-      }
+    }
 
-      if (formData.isGithubEnabled) {
+    if (formData.isGithubEnabled) {
-        enabledMethods.push(LoginMethod.GITHUB);
+      enabledMethods.push(LoginMethod.GITHUB);
-      }
+    }
 
-      if (formData.isGitlabEnabled) {
+    if (formData.isGitlabEnabled) {
-        enabledMethods.push(LoginMethod.GITLAB);
+      enabledMethods.push(LoginMethod.GITLAB);
-      }
+    }
 
-      if (formData.isSamlEnabled) {
+    if (formData.isSamlEnabled) {
-        enabledMethods.push(LoginMethod.SAML);
+      enabledMethods.push(LoginMethod.SAML);
-      }
+    }
 
-      if (formData.isLdapEnabled) {
+    if (formData.isLdapEnabled) {
-        enabledMethods.push(LoginMethod.LDAP);
+      enabledMethods.push(LoginMethod.LDAP);
-      }
+    }
 
-      if (formData.isOidcEnabled) {
+    if (formData.isOidcEnabled) {
-        enabledMethods.push(LoginMethod.OIDC);
+      enabledMethods.push(LoginMethod.OIDC);
-      }
+    }
 
-      if (!enabledMethods.length) {
+    if (!enabledMethods.length) {
-        createNotification({
-          type: "error",
-          text: "At least one login method should be enabled."
-        });
-        return;
-      }
-
-      await updateServerConfig({
-        enabledLoginMethods: enabledMethods
-      });
-
-      createNotification({
-        text: "Login methods have been successfully updated.",
-        type: "success"
-      });
-    } catch (e) {
-      console.error(e);
       createNotification({
         type: "error",
-        text: "Failed to update login methods."
+        text: "At least one login method should be enabled."
       });
+      return;
     }
+
+    await updateServerConfig({
+      enabledLoginMethods: enabledMethods
+    });
+
+    createNotification({
+      text: "Login methods have been successfully updated.",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/admin/CachingPage/components/CachingPageForm.tsx

@@ -31,15 +31,10 @@ export const CachingPageForm = () => {
   const handleInvalidateCacheSubmit = async () => {
     if (!type || isInvalidating) return;
 
-    try {
+    await invalidateCache({ type });
-      await invalidateCache({ type });
+    createNotification({ text: `Began invalidating ${type} cache`, type: "success" });
-      createNotification({ text: `Began invalidating ${type} cache`, type: "success" });
+    setShouldPoll(true);
-      setShouldPoll(true);
+    handlePopUpClose("invalidateCache");
-      handlePopUpClose("invalidateCache");
-    } catch (err) {
-      console.error(err);
-      createNotification({ text: `Failed to invalidate ${type} cache`, type: "error" });
-    }
   };
 
   useEffect(() => {

frontend/src/pages/admin/EncryptionPage/components/EncryptionPageForm.tsx

@@ -60,19 +60,12 @@ export const EncryptionPageForm = () => {
       return;
     }
 
-    try {
+    await updateEncryptionStrategy(formData.encryptionStrategy);
-      await updateEncryptionStrategy(formData.encryptionStrategy);
 
-      createNotification({
+    createNotification({
-        type: "success",
+      type: "success",
-        text: "Encryption strategy updated successfully"
+      text: "Encryption strategy updated successfully"
-      });
+    });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Failed to update encryption strategy"
-      });
-    }
   }, []);
 
   return (

frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx

@@ -176,31 +176,19 @@ export const EnvironmentPageForm = () => {
 
   const onSubmit = useCallback(
     async (formData: TForm) => {
-      try {
+      const filteredFormData = Object.fromEntries(
-        const filteredFormData = Object.fromEntries(
+        Object.entries(formData).filter(([, value]) => value !== "")
-          Object.entries(formData).filter(([, value]) => value !== "")
+      );
-        );
+      await updateServerConfig({
-        await updateServerConfig({
+        envOverrides: filteredFormData
-          envOverrides: filteredFormData
+      });
-        });
 
-        createNotification({
+      createNotification({
-          type: "success",
+        type: "success",
-          text: "Environment overrides updated successfully. It can take up to 5 minutes to take effect."
+        text: "Environment overrides updated successfully. It can take up to 5 minutes to take effect."
-        });
+      });
 
-        reset(formData);
+      reset(formData);
-      } catch (error) {
-        const errorMessage =
-          (error as any)?.response?.data?.message ||
-          (error as any)?.message ||
-          "An unknown error occurred";
-        createNotification({
-          type: "error",
-          title: "Failed to update environment overrides",
-          text: errorMessage
-        });
-      }
     },
     [reset, updateServerConfig]
   );

frontend/src/pages/admin/GeneralPage/components/GeneralPageForm.tsx

@@ -68,37 +68,29 @@ export const GeneralPageForm = () => {
   const organizations = useGetOrganizations();
 
   const onFormSubmit = async (formData: TDashboardForm) => {
-    try {
+    const {
-      const {
+      allowedSignUpDomain,
-        allowedSignUpDomain,
+      trustSamlEmails,
-        trustSamlEmails,
+      trustLdapEmails,
-        trustLdapEmails,
+      trustOidcEmails,
-        trustOidcEmails,
+      authConsentContent,
-        authConsentContent,
+      pageFrameContent
-        pageFrameContent
+    } = formData;
-      } = formData;
 
-      await updateServerConfig({
+    await updateServerConfig({
-        defaultAuthOrgId: defaultAuthOrgId || null,
+      defaultAuthOrgId: defaultAuthOrgId || null,
-        allowSignUp: signUpMode !== SignUpModes.Disabled,
+      allowSignUp: signUpMode !== SignUpModes.Disabled,
-        allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
+      allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
-        trustSamlEmails,
+      trustSamlEmails,
-        trustLdapEmails,
+      trustLdapEmails,
-        trustOidcEmails,
+      trustOidcEmails,
-        authConsentContent,
+      authConsentContent,
-        pageFrameContent
+      pageFrameContent
-      });
+    });
-      createNotification({
+    createNotification({
-        text: "Successfully changed sign up setting.",
+      text: "Successfully changed sign up setting.",
-        type: "success"
+      type: "success"
-      });
+    });
-    } catch (e) {
-      console.error(e);
-      createNotification({
-        type: "error",
-        text: "Failed to update sign up setting."
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/GeneralPage/components/UsageReportSection.tsx

@@ -10,23 +10,15 @@ export const UsageReportSection = () => {
   const generateUsageReport = useGenerateUsageReport();
 
   const handleGenerateReport = async () => {
-    try {
+    const response = await generateUsageReport.mutateAsync();
-      const response = await generateUsageReport.mutateAsync();
+    const { csvContent, filename } = response;
-      const { csvContent, filename } = response;
 
-      downloadFile(csvContent, filename, "text/csv");
+    downloadFile(csvContent, filename, "text/csv");
 
-      createNotification({
+    createNotification({
-        text: `Usage report downloaded: "${filename}"`,
+      text: `Usage report downloaded: "${filename}"`,
-        type: "success"
+      type: "success"
-      });
+    });
-    } catch (error) {
-      console.error("Failed to generate usage report:", error);
-      createNotification({
-        text: "Failed to generate usage report. Please try again.",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/ResourceOverviewPage/components/AddOrganizationModal.tsx

@@ -81,25 +81,18 @@ const Content = ({ onClose }: ContentProps) => {
   const { users = [] } = data ?? {};
 
   const onSubmit = async ({ name, invitees }: FormData) => {
-    try {
+    await createOrg.mutateAsync({
-      await createOrg.mutateAsync({
+      name,
-        name,
+      inviteAdminEmails: invitees
-        inviteAdminEmails: invitees
+        .filter((user) => Boolean(user.email))
-          .filter((user) => Boolean(user.email))
+        .map((user) => user.email) as string[]
-          .map((user) => user.email) as string[]
+    });
-      });
 
-      createNotification({
+    createNotification({
-        type: "success",
+      type: "success",
-        text: "Successfully created organization"
+      text: "Successfully created organization"
-      });
+    });
-      onClose();
+    onClose();
-    } catch {
-      createNotification({
-        text: "Failed to create organization",
-        type: "error"
-      });
-    }
   };
 
   const { append } = useFieldArray<FormData>({ control, name: "invitees" });

frontend/src/pages/admin/ResourceOverviewPage/components/MachineIdentitiesTable.tsx

@@ -185,18 +185,11 @@ export const MachineIdentitiesTable = () => {
   const handleRemoveServerAdmin = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; name: string };
 
-    try {
+    await deleteIdentitySuperAdminAccess(id);
-      await deleteIdentitySuperAdminAccess(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully removed server admin permissions"
-        text: "Successfully removed server admin permissions"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin permissions"
-      });
-    }
 
     handlePopUpClose("removeServerAdmin");
   };

frontend/src/pages/admin/ResourceOverviewPage/components/OrganizationsTable.tsx

@@ -179,12 +179,6 @@ const ViewMembersModalContent = ({
         text: "Successfully resent org invitation",
         type: "success"
       });
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to resend org invitation",
-        type: "error"
-      });
     } finally {
       setResendInviteId(null);
     }
@@ -479,26 +473,19 @@ const OrganizationsPanelTable = ({
   const { mutateAsync: accessOrganization } = useServerAdminAccessOrg();
 
   const handleAccessOrg = async (orgId: string) => {
-    try {
+    await accessOrganization(orgId);
-      await accessOrganization(orgId);
 
-      navigate({
+    navigate({
-        to: "/login/select-organization",
+      to: "/login/select-organization",
-        search: {
+      search: {
-          org_id: orgId
+        org_id: orgId
-        }
+      }
-      });
+    });
 
-      createNotification({
+    createNotification({
-        text: "Successfully joined organization",
+      text: "Successfully joined organization",
-        type: "success"
+      type: "success"
-      });
+    });
-    } catch {
-      createNotification({
-        text: "Failed to join organization",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/ResourceOverviewPage/components/UserIdentitiesTable.tsx

@@ -364,18 +364,11 @@ export const UserIdentitiesTable = () => {
   const handleRemoveUser = async () => {
     const { id } = popUp?.removeUser?.data as { id: string; username: string };
 
-    try {
+    await deleteUser(id);
-      await deleteUser(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully deleted user"
-        text: "Successfully deleted user"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error deleting user"
-      });
-    }
 
     handlePopUpClose("removeUser");
   };
@@ -383,18 +376,11 @@ export const UserIdentitiesTable = () => {
   const handleGrantServerAdminAccess = async () => {
     const { id } = popUp?.upgradeToServerAdmin?.data as { id: string; username: string };
 
-    try {
+    await grantAdminAccess(id);
-      await grantAdminAccess(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully granted server admin access to user"
-        text: "Successfully granted server admin access to user"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error granting server admin access to user"
-      });
-    }
 
     handlePopUpClose("upgradeToServerAdmin");
   };
@@ -402,39 +388,25 @@ export const UserIdentitiesTable = () => {
   const handleRemoveServerAdminAccess = async () => {
     const { id } = popUp?.removeServerAdmin?.data as { id: string; username: string };
 
-    try {
+    await removeAdminAccess(id);
-      await removeAdminAccess(id);
+    createNotification({
-      createNotification({
+      type: "success",
-        type: "success",
+      text: "Successfully removed server admin access from user"
-        text: "Successfully removed server admin access from user"
+    });
-      });
-    } catch {
-      createNotification({
-        type: "error",
-        text: "Error removing server admin access from user"
-      });
-    }
 
     handlePopUpClose("removeServerAdmin");
   };
 
   const handleRemoveUsers = async () => {
-    try {
+    await deleteUsers(selectedUsers.map((user) => user.id));
-      await deleteUsers(selectedUsers.map((user) => user.id));
 
-      createNotification({
+    createNotification({
-        text: "Successfully removed users",
+      text: "Successfully removed users",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      setSelectedUsers([]);
+    setSelectedUsers([]);
-      handlePopUpClose("removeUsers");
+    handlePopUpClose("removeUsers");
-    } catch {
-      createNotification({
-        text: "Failed to remove users",
-        type: "error"
-      });
-    }
   };
 
   return (

frontend/src/pages/admin/SignUpPage/SignUpPage.tsx

@@ -6,7 +6,6 @@ import { useNavigate } from "@tanstack/react-router";
 import { AnimatePresence, motion } from "framer-motion";
 import { z } from "zod";
 
-import { createNotification } from "@app/components/notifications";
 // TODO(akhilmhdh): rewrite this into module functions in lib
 import SecurityClient from "@app/components/utilities/SecurityClient";
 import { Button, ContentLoader, FormControl, Input } from "@app/components/v2";
@@ -46,29 +45,21 @@ export const SignUpPage = () => {
   const handleFormSubmit = async ({ email, password, firstName, lastName }: TFormSchema) => {
     // avoid multi submission
     if (isSubmitting) return;
-    try {
+    const res = await createAdminUser({
-      const res = await createAdminUser({
+      email,
-        email,
+      password,
-        password,
+      firstName,
-        firstName,
+      lastName
-        lastName
+    });
-      });
 
-      SecurityClient.setToken(res.token);
+    SecurityClient.setToken(res.token);
-      await selectOrganization({ organizationId: res.organization.id });
+    await selectOrganization({ organizationId: res.organization.id });
 
-      // TODO(akhilmhdh): This is such a confusing pattern and too unreliable
+    // TODO(akhilmhdh): This is such a confusing pattern and too unreliable
-      // Will be refactored in next iteration to make it url based rather than local storage ones
+    // Will be refactored in next iteration to make it url based rather than local storage ones
-      // Part of migration to nextjs 14
+    // Part of migration to nextjs 14
-      localStorage.setItem("orgData.id", res.organization.id);
+    localStorage.setItem("orgData.id", res.organization.id);
-      navigate({ to: "/admin" });
+    navigate({ to: "/admin" });
-    } catch (err) {
-      console.log(err);
-      createNotification({
-        type: "error",
-        text: "Failed to create admin"
-      });
-    }
   };
 
   if (config?.initialized) return <ContentLoader text="Redirecting to admin page..." />;

frontend/src/pages/auth/PasswordSetupPage/PasswordSetupPage.tsx

@@ -75,11 +75,7 @@ export const PasswordSetupPage = () => {
         setTimeout(() => {
           window.location.href = "/login";
         }, 3000);
-      } catch (error) {
+      } catch {
-        createNotification({
-          type: "error",
-          text: (error as Error).message ?? "Error setting password"
-        });
         navigate({ to: "/personal-settings" });
       }
     }

frontend/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx

@@ -73,67 +73,53 @@ export const EmailConfirmationStep = ({
   const { mutateAsync: verifyEmailVerificationCode } = useVerifyEmailVerificationCode();
 
   const checkCode = async () => {
-    try {
+    await verifyEmailVerificationCode({ username, code });
-      await verifyEmailVerificationCode({ username, code });
+    setCodeError(false);
-      setCodeError(false);
 
-      createNotification({
+    createNotification({
-        text: "Successfully verified code",
+      text: "Successfully verified code",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      switch (authType) {
+    switch (authType) {
-        case UserAliasType.SAML: {
+      case UserAliasType.SAML: {
-          window.open(`/api/v1/sso/redirect/saml2/organizations/${organizationSlug}`);
+        window.open(`/api/v1/sso/redirect/saml2/organizations/${organizationSlug}`);
-          window.close();
+        window.close();
-          break;
+        break;
-        }
+      }
-        case UserAliasType.LDAP: {
+      case UserAliasType.LDAP: {
-          navigate({ to: "/login/ldap", search: { organizationSlug } });
+        navigate({ to: "/login/ldap", search: { organizationSlug } });
-          break;
+        break;
-        }
+      }
-        case UserAliasType.OIDC: {
+      case UserAliasType.OIDC: {
-          window.open(`/api/v1/sso/oidc/login?orgSlug=${organizationSlug}`);
+        window.open(`/api/v1/sso/oidc/login?orgSlug=${organizationSlug}`);
-          window.close();
+        window.close();
-          break;
+        break;
-        }
+      }
-        default: {
+      default: {
-          setStep(1);
+        setStep(1);
-          break;
+        break;
-        }
       }
-    } catch {
-      createNotification({
-        text: "Failed to verify code",
-        type: "error"
-      });
     }
 
     setCode("");
   };
 
   const resendCode = async () => {
-    try {
+    const queryParams = new URLSearchParams(window.location.search);
-      const queryParams = new URLSearchParams(window.location.search);
+    const token = queryParams.get("token");
-      const token = queryParams.get("token");
+    if (!token) {
-      if (!token) {
-        createNotification({
-          text: "Failed to resend code, no token found",
-          type: "error"
-        });
-        return;
-      }
-      await sendEmailVerificationCode(token);
       createNotification({
-        text: "Successfully resent code",
+        text: "Failed to resend code, no token found",
-        type: "success"
-      });
-    } catch {
-      createNotification({
-        text: "Failed to resend code",
         type: "error"
       });
+      return;
     }
+    await sendEmailVerificationCode(token);
+    createNotification({
+      text: "Successfully resent code",
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertModal.tsx

@@ -113,52 +113,44 @@ export const PkiAlertModal = ({ popUp, handlePopUpToggle }: Props) => {
     alertUnit,
     emails
   }: FormData) => {
-    try {
+    if (!projectId) return;
-      if (!projectId) return;
 
-      const emailArray = emails
+    const emailArray = emails
-        .split(",")
+      .split(",")
-        .map((email) => email.trim())
+      .map((email) => email.trim())
-        .filter((email) => email.length > 0);
+      .filter((email) => email.length > 0);
 
-      const alertBeforeDays = convertToDays(alertUnit, Number(alertBefore));
+    const alertBeforeDays = convertToDays(alertUnit, Number(alertBefore));
 
-      if (alert) {
+    if (alert) {
-        // update
+      // update
-        await updatePkiAlert({
+      await updatePkiAlert({
-          alertId: alert.id,
+        alertId: alert.id,
-          pkiCollectionId,
+        pkiCollectionId,
-          name,
+        name,
-          projectId,
+        projectId,
-          alertBeforeDays,
+        alertBeforeDays,
-          emails: emailArray
+        emails: emailArray
-        });
-      } else {
-        // create
-        await createPkiAlert({
-          name,
-          projectId,
-          pkiCollectionId,
-          alertBeforeDays,
-          emails: emailArray
-        });
-      }
-
-      handlePopUpToggle("pkiAlert", false);
-
-      reset();
-
-      createNotification({
-        text: `Successfully ${alert ? "updated" : "created"} alert`,
-        type: "success"
       });
-    } catch (err) {
+    } else {
-      console.error(err);
+      // create
-      createNotification({
+      await createPkiAlert({
-        text: `Failed to ${alert ? "updated" : "created"} alert`,
+        name,
-        type: "error"
+        projectId,
+        pkiCollectionId,
+        alertBeforeDays,
+        emails: emailArray
       });
     }
+
+    handlePopUpToggle("pkiAlert", false);
+
+    reset();
+
+    createNotification({
+      text: `Successfully ${alert ? "updated" : "created"} alert`,
+      type: "success"
+    });
   };
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx

@@ -22,27 +22,19 @@ export const PkiAlertsSection = () => {
   ] as const);
 
   const onRemoveAlertSubmit = async (alertId: string) => {
-    try {
+    if (!projectId) return;
-      if (!projectId) return;
 
-      await deletePkiAlert({
+    await deletePkiAlert({
-        alertId,
+      alertId,
-        projectId
+      projectId
-      });
+    });
 
-      createNotification({
+    createNotification({
-        text: "Successfully deleted alert",
+      text: "Successfully deleted alert",
-        type: "success"
+      type: "success"
-      });
+    });
 
-      handlePopUpClose("deletePkiAlert");
+    handlePopUpClose("deletePkiAlert");
-    } catch (err) {
-      console.error(err);
-      createNotification({
-        text: "Failed to delete alert",
-        type: "error"
-      });
-    }
   };
 
   return (