misc: added image for service usage API

backend/e2e-test/mocks/keystore.ts

@@ -8,9 +8,6 @@ import { Lock } from "@app/lib/red-lock";
 export const mockKeyStore = (): TKeyStoreFactory => {
   const store: Record<string, string | number | Buffer> = {};
 
-  const getRegex = (pattern: string) =>
-    new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
-
   return {
     setItem: async (key, value) => {
       store[key] = value;
@@ -26,7 +23,7 @@ export const mockKeyStore = (): TKeyStoreFactory => {
       return 1;
     },
     deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => {
-      const regex = getRegex(pattern);
+      const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
       let totalDeleted = 0;
       const keys = Object.keys(store);
 
@@ -56,27 +53,6 @@ export const mockKeyStore = (): TKeyStoreFactory => {
     incrementBy: async () => {
       return 1;
     },
-    getItems: async (keys) => {
-      const values = keys.map((key) => {
-        const value = store[key];
-        if (typeof value === "string") {
-          return value;
-        }
-        return null;
-      });
-      return values;
-    },
-    getKeysByPattern: async (pattern) => {
-      const regex = getRegex(pattern);
-      const keys = Object.keys(store);
-      return keys.filter((key) => regex.test(key));
-    },
-    deleteItemsByKeyIn: async (keys) => {
-      for (const key of keys) {
-        delete store[key];
-      }
-      return keys.length;
-    },
     acquireLock: () => {
       return Promise.resolve({
         release: () => {}

backend/src/@types/fastify.d.ts

@@ -74,7 +74,6 @@ import { TAllowedFields } from "@app/services/identity-ldap-auth/identity-ldap-a
 import { TIdentityOciAuthServiceFactory } from "@app/services/identity-oci-auth/identity-oci-auth-service";
 import { TIdentityOidcAuthServiceFactory } from "@app/services/identity-oidc-auth/identity-oidc-auth-service";
 import { TIdentityProjectServiceFactory } from "@app/services/identity-project/identity-project-service";
-import { TIdentityTlsCertAuthServiceFactory } from "@app/services/identity-tls-cert-auth/identity-tls-cert-auth-types";
 import { TIdentityTokenAuthServiceFactory } from "@app/services/identity-token-auth/identity-token-auth-service";
 import { TIdentityUaServiceFactory } from "@app/services/identity-ua/identity-ua-service";
 import { TIntegrationServiceFactory } from "@app/services/integration/integration-service";
@@ -219,7 +218,6 @@ declare module "fastify" {
       identityKubernetesAuth: TIdentityKubernetesAuthServiceFactory;
       identityGcpAuth: TIdentityGcpAuthServiceFactory;
       identityAliCloudAuth: TIdentityAliCloudAuthServiceFactory;
-      identityTlsCertAuth: TIdentityTlsCertAuthServiceFactory;
       identityAwsAuth: TIdentityAwsAuthServiceFactory;
       identityAzureAuth: TIdentityAzureAuthServiceFactory;
       identityOciAuth: TIdentityOciAuthServiceFactory;

backend/src/@types/knex.d.ts

@@ -164,9 +164,6 @@ import {
   TIdentityProjectMemberships,
   TIdentityProjectMembershipsInsert,
   TIdentityProjectMembershipsUpdate,
-  TIdentityTlsCertAuths,
-  TIdentityTlsCertAuthsInsert,
-  TIdentityTlsCertAuthsUpdate,
   TIdentityTokenAuths,
   TIdentityTokenAuthsInsert,
   TIdentityTokenAuthsUpdate,
@@ -797,11 +794,6 @@ declare module "knex/types/tables" {
       TIdentityAlicloudAuthsInsert,
       TIdentityAlicloudAuthsUpdate
     >;
-    [TableName.IdentityTlsCertAuth]: KnexOriginal.CompositeTableType<
-      TIdentityTlsCertAuths,
-      TIdentityTlsCertAuthsInsert,
-      TIdentityTlsCertAuthsUpdate
-    >;
     [TableName.IdentityAwsAuth]: KnexOriginal.CompositeTableType<
       TIdentityAwsAuths,
       TIdentityAwsAuthsInsert,

backend/src/db/migrations/20250624061429_identity-tls-auth.ts

@@ -1,28 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-import { createOnUpdateTrigger, dropOnUpdateTrigger } from "../utils";
-
-export async function up(knex: Knex): Promise<void> {
-  if (!(await knex.schema.hasTable(TableName.IdentityTlsCertAuth))) {
-    await knex.schema.createTable(TableName.IdentityTlsCertAuth, (t) => {
-      t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
-      t.bigInteger("accessTokenTTL").defaultTo(7200).notNullable();
-      t.bigInteger("accessTokenMaxTTL").defaultTo(7200).notNullable();
-      t.bigInteger("accessTokenNumUsesLimit").defaultTo(0).notNullable();
-      t.jsonb("accessTokenTrustedIps").notNullable();
-      t.timestamps(true, true, true);
-      t.uuid("identityId").notNullable().unique();
-      t.foreign("identityId").references("id").inTable(TableName.Identity).onDelete("CASCADE");
-      t.string("allowedCommonNames").nullable();
-      t.binary("encryptedCaCertificate").notNullable();
-    });
-  }
-
-  await createOnUpdateTrigger(knex, TableName.IdentityTlsCertAuth);
-}
-
-export async function down(knex: Knex): Promise<void> {
-  await knex.schema.dropTableIfExists(TableName.IdentityTlsCertAuth);
-  await dropOnUpdateTrigger(knex, TableName.IdentityTlsCertAuth);
-}

backend/src/db/schemas/identity-tls-cert-auths.ts

@@ -1,27 +0,0 @@
-// Code generated by automation script, DO NOT EDIT.
-// Automated by pulling database and generating zod schema
-// To update. Just run npm run generate:schema
-// Written by akhilmhdh.
-
-import { z } from "zod";
-
-import { zodBuffer } from "@app/lib/zod";
-
-import { TImmutableDBKeys } from "./models";
-
-export const IdentityTlsCertAuthsSchema = z.object({
-  id: z.string().uuid(),
-  accessTokenTTL: z.coerce.number().default(7200),
-  accessTokenMaxTTL: z.coerce.number().default(7200),
-  accessTokenNumUsesLimit: z.coerce.number().default(0),
-  accessTokenTrustedIps: z.unknown(),
-  createdAt: z.date(),
-  updatedAt: z.date(),
-  identityId: z.string().uuid(),
-  allowedCommonNames: z.string().nullable().optional(),
-  encryptedCaCertificate: zodBuffer
-});
-
-export type TIdentityTlsCertAuths = z.infer<typeof IdentityTlsCertAuthsSchema>;
-export type TIdentityTlsCertAuthsInsert = Omit<z.input<typeof IdentityTlsCertAuthsSchema>, TImmutableDBKeys>;
-export type TIdentityTlsCertAuthsUpdate = Partial<Omit<z.input<typeof IdentityTlsCertAuthsSchema>, TImmutableDBKeys>>;

backend/src/db/schemas/index.ts

@@ -52,7 +52,6 @@ export * from "./identity-org-memberships";
 export * from "./identity-project-additional-privilege";
 export * from "./identity-project-membership-role";
 export * from "./identity-project-memberships";
-export * from "./identity-tls-cert-auths";
 export * from "./identity-token-auths";
 export * from "./identity-ua-client-secrets";
 export * from "./identity-universal-auths";

backend/src/db/schemas/models.ts

@@ -86,7 +86,6 @@ export enum TableName {
   IdentityOidcAuth = "identity_oidc_auths",
   IdentityJwtAuth = "identity_jwt_auths",
   IdentityLdapAuth = "identity_ldap_auths",
-  IdentityTlsCertAuth = "identity_tls_cert_auths",
   IdentityOrgMembership = "identity_org_memberships",
   IdentityProjectMembership = "identity_project_memberships",
   IdentityProjectMembershipRole = "identity_project_membership_role",
@@ -252,7 +251,6 @@ export enum IdentityAuthMethod {
   ALICLOUD_AUTH = "alicloud-auth",
   AWS_AUTH = "aws-auth",
   AZURE_AUTH = "azure-auth",
-  TLS_CERT_AUTH = "tls-cert-auth",
   OCI_AUTH = "oci-auth",
   OIDC_AUTH = "oidc-auth",
   JWT_AUTH = "jwt-auth",

backend/src/ee/routes/v1/ssh-certificate-router.ts

@@ -80,7 +80,6 @@ export const registerSshCertRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SignSshKey,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           certificateTemplateId: req.body.certificateTemplateId,
           principals: req.body.principals,
@@ -172,7 +171,6 @@ export const registerSshCertRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueSshCreds,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           certificateTemplateId: req.body.certificateTemplateId,
           principals: req.body.principals,

backend/src/ee/routes/v1/ssh-host-router.ts

@@ -358,7 +358,6 @@ export const registerSshHostRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueSshHostUserCert,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           sshHostId: req.params.sshHostId,
           hostname: host.hostname,
@@ -428,7 +427,6 @@ export const registerSshHostRouter = async (server: FastifyZodProvider) => {
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueSshHostHostCert,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           sshHostId: req.params.sshHostId,

backend/src/ee/services/audit-log/audit-log-types.ts

@@ -202,12 +202,6 @@ export enum EventType {
   REVOKE_IDENTITY_ALICLOUD_AUTH = "revoke-identity-alicloud-auth",
   GET_IDENTITY_ALICLOUD_AUTH = "get-identity-alicloud-auth",
 
-  LOGIN_IDENTITY_TLS_CERT_AUTH = "login-identity-tls-cert-auth",
-  ADD_IDENTITY_TLS_CERT_AUTH = "add-identity-tls-cert-auth",
-  UPDATE_IDENTITY_TLS_CERT_AUTH = "update-identity-tls-cert-auth",
-  REVOKE_IDENTITY_TLS_CERT_AUTH = "revoke-identity-tls-cert-auth",
-  GET_IDENTITY_TLS_CERT_AUTH = "get-identity-tls-cert-auth",
-
   LOGIN_IDENTITY_AWS_AUTH = "login-identity-aws-auth",
   ADD_IDENTITY_AWS_AUTH = "add-identity-aws-auth",
   UPDATE_IDENTITY_AWS_AUTH = "update-identity-aws-auth",
@@ -1147,53 +1141,6 @@ interface GetIdentityAliCloudAuthEvent {
   };
 }
 
-interface LoginIdentityTlsCertAuthEvent {
-  type: EventType.LOGIN_IDENTITY_TLS_CERT_AUTH;
-  metadata: {
-    identityId: string;
-    identityTlsCertAuthId: string;
-    identityAccessTokenId: string;
-  };
-}
-
-interface AddIdentityTlsCertAuthEvent {
-  type: EventType.ADD_IDENTITY_TLS_CERT_AUTH;
-  metadata: {
-    identityId: string;
-    allowedCommonNames: string | null | undefined;
-    accessTokenTTL: number;
-    accessTokenMaxTTL: number;
-    accessTokenNumUsesLimit: number;
-    accessTokenTrustedIps: Array<TIdentityTrustedIp>;
-  };
-}
-
-interface DeleteIdentityTlsCertAuthEvent {
-  type: EventType.REVOKE_IDENTITY_TLS_CERT_AUTH;
-  metadata: {
-    identityId: string;
-  };
-}
-
-interface UpdateIdentityTlsCertAuthEvent {
-  type: EventType.UPDATE_IDENTITY_TLS_CERT_AUTH;
-  metadata: {
-    identityId: string;
-    allowedCommonNames: string | null | undefined;
-    accessTokenTTL?: number;
-    accessTokenMaxTTL?: number;
-    accessTokenNumUsesLimit?: number;
-    accessTokenTrustedIps?: Array<TIdentityTrustedIp>;
-  };
-}
-
-interface GetIdentityTlsCertAuthEvent {
-  type: EventType.GET_IDENTITY_TLS_CERT_AUTH;
-  metadata: {
-    identityId: string;
-  };
-}
-
 interface LoginIdentityOciAuthEvent {
   type: EventType.LOGIN_IDENTITY_OCI_AUTH;
   metadata: {
@@ -3411,11 +3358,6 @@ export type Event =
   | UpdateIdentityAliCloudAuthEvent
   | GetIdentityAliCloudAuthEvent
   | DeleteIdentityAliCloudAuthEvent
-  | LoginIdentityTlsCertAuthEvent
-  | AddIdentityTlsCertAuthEvent
-  | UpdateIdentityTlsCertAuthEvent
-  | GetIdentityTlsCertAuthEvent
-  | DeleteIdentityTlsCertAuthEvent
   | LoginIdentityOciAuthEvent
   | AddIdentityOciAuthEvent
   | UpdateIdentityOciAuthEvent

backend/src/keystore/keystore.ts

@@ -73,7 +73,6 @@ type TWaitTillReady = {
 export type TKeyStoreFactory = {
   setItem: (key: string, value: string | number | Buffer, prefix?: string) => Promise<"OK">;
   getItem: (key: string, prefix?: string) => Promise<string | null>;
-  getItems: (keys: string[], prefix?: string) => Promise<(string | null)[]>;
   setExpiry: (key: string, expiryInSeconds: number) => Promise<number>;
   setItemWithExpiry: (
     key: string,
@@ -82,7 +81,6 @@ export type TKeyStoreFactory = {
     prefix?: string
   ) => Promise<"OK">;
   deleteItem: (key: string) => Promise<number>;
-  deleteItemsByKeyIn: (keys: string[]) => Promise<number>;
   deleteItems: (arg: TDeleteItems) => Promise<number>;
   incrementBy: (key: string, value: number) => Promise<number>;
   acquireLock(
@@ -91,7 +89,6 @@ export type TKeyStoreFactory = {
     settings?: Partial<Settings>
   ): Promise<{ release: () => Promise<ExecutionResult> }>;
   waitTillReady: ({ key, waitingCb, keyCheckCb, waitIteration, delay, jitter }: TWaitTillReady) => Promise<void>;
-  getKeysByPattern: (pattern: string, limit?: number) => Promise<string[]>;
 };
 
 export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFactory => {
@@ -103,9 +100,6 @@ export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFac
 
   const getItem = async (key: string, prefix?: string) => redis.get(prefix ? `${prefix}:${key}` : key);
 
-  const getItems = async (keys: string[], prefix?: string) =>
-    redis.mget(keys.map((key) => (prefix ? `${prefix}:${key}` : key)));
-
   const setItemWithExpiry = async (
     key: string,
     expiryInSeconds: number | string,
@@ -115,11 +109,6 @@ export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFac
 
   const deleteItem = async (key: string) => redis.del(key);
 
-  const deleteItemsByKeyIn = async (keys: string[]) => {
-    if (keys.length === 0) return 0;
-    return redis.del(keys);
-  };
-
   const deleteItems = async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }: TDeleteItems) => {
     let cursor = "0";
     let totalDeleted = 0;
@@ -175,24 +164,6 @@ export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFac
     }
   };
 
-  const getKeysByPattern = async (pattern: string, limit?: number) => {
-    let cursor = "0";
-    const allKeys: string[] = [];
-
-    do {
-      // eslint-disable-next-line no-await-in-loop
-      const [nextCursor, keys] = await redis.scan(cursor, "MATCH", pattern, "COUNT", 1000);
-      cursor = nextCursor;
-      allKeys.push(...keys);
-
-      if (limit && allKeys.length >= limit) {
-        return allKeys.slice(0, limit);
-      }
-    } while (cursor !== "0");
-
-    return allKeys;
-  };
-
   return {
     setItem,
     getItem,
@@ -204,9 +175,6 @@ export const keyStoreFactory = (redisConfigKeys: TRedisConfigKeys): TKeyStoreFac
     acquireLock(resources: string[], duration: number, settings?: Partial<Settings>) {
       return redisLock.acquire(resources, duration, settings);
     },
-    waitTillReady,
-    getKeysByPattern,
-    deleteItemsByKeyIn,
-    getItems
+    waitTillReady
   };
 };

backend/src/keystore/memory.ts

@@ -8,8 +8,6 @@ import { TKeyStoreFactory } from "./keystore";
 
 export const inMemoryKeyStore = (): TKeyStoreFactory => {
   const store: Record<string, string | number | Buffer> = {};
-  const getRegex = (pattern: string) =>
-    new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
 
   return {
     setItem: async (key, value) => {
@@ -26,7 +24,7 @@ export const inMemoryKeyStore = (): TKeyStoreFactory => {
       return 1;
     },
     deleteItems: async ({ pattern, batchSize = 500, delay = 1500, jitter = 200 }) => {
-      const regex = getRegex(pattern);
+      const regex = new RE2(`^${pattern.replace(/[-[\]/{}()+?.\\^$|]/g, "\\$&").replace(/\*/g, ".*")}$`);
       let totalDeleted = 0;
       const keys = Object.keys(store);
 
@@ -61,27 +59,6 @@ export const inMemoryKeyStore = (): TKeyStoreFactory => {
         release: () => {}
       }) as Promise<Lock>;
     },
-    waitTillReady: async () => {},
-    getKeysByPattern: async (pattern) => {
-      const regex = getRegex(pattern);
-      const keys = Object.keys(store);
-      return keys.filter((key) => regex.test(key));
-    },
-    deleteItemsByKeyIn: async (keys) => {
-      for (const key of keys) {
-        delete store[key];
-      }
-      return keys.length;
-    },
-    getItems: async (keys) => {
-      const values = keys.map((key) => {
-        const value = store[key];
-        if (typeof value === "string") {
-          return value;
-        }
-        return null;
-      });
-      return values;
-    }
+    waitTillReady: async () => {}
   };
 };

backend/src/lib/api-docs/constants.ts

@@ -22,7 +22,6 @@ export enum ApiDocsTags {
   UniversalAuth = "Universal Auth",
   GcpAuth = "GCP Auth",
   AliCloudAuth = "Alibaba Cloud Auth",
-  TlsCertAuth = "TLS Certificate Auth",
   AwsAuth = "AWS Auth",
   OciAuth = "OCI Auth",
   AzureAuth = "Azure Auth",
@@ -284,38 +283,6 @@ export const ALICLOUD_AUTH = {
   }
 } as const;
 
-export const TLS_CERT_AUTH = {
-  LOGIN: {
-    identityId: "The ID of the identity to login."
-  },
-  ATTACH: {
-    identityId: "The ID of the identity to attach the configuration onto.",
-    allowedCommonNames:
-      "The comma-separated list of trusted common names that are allowed to authenticate with Infisical.",
-    caCertificate: "The PEM-encoded CA certificate to validate client certificates.",
-    accessTokenTTL: "The lifetime for an access token in seconds.",
-    accessTokenMaxTTL: "The maximum lifetime for an access token in seconds.",
-    accessTokenNumUsesLimit: "The maximum number of times that an access token can be used.",
-    accessTokenTrustedIps: "The IPs or CIDR ranges that access tokens can be used from."
-  },
-  UPDATE: {
-    identityId: "The ID of the identity to update the auth method for.",
-    allowedCommonNames:
-      "The comma-separated list of trusted common names that are allowed to authenticate with Infisical.",
-    caCertificate: "The PEM-encoded CA certificate to validate client certificates.",
-    accessTokenTTL: "The new lifetime for an access token in seconds.",
-    accessTokenMaxTTL: "The new maximum lifetime for an access token in seconds.",
-    accessTokenNumUsesLimit: "The new maximum number of times that an access token can be used.",
-    accessTokenTrustedIps: "The new IPs or CIDR ranges that access tokens can be used from."
-  },
-  RETRIEVE: {
-    identityId: "The ID of the identity to retrieve the auth method for."
-  },
-  REVOKE: {
-    identityId: "The ID of the identity to revoke the auth method for."
-  }
-} as const;
-
 export const AWS_AUTH = {
   LOGIN: {
     identityId: "The ID of the identity to login.",

backend/src/lib/config/env.ts

@@ -193,9 +193,6 @@ const envSchema = z
     PYLON_API_KEY: zpStr(z.string().optional()),
     DISABLE_AUDIT_LOG_GENERATION: zodStrBool.default("false"),
     SSL_CLIENT_CERTIFICATE_HEADER_KEY: zpStr(z.string().optional()).default("x-ssl-client-cert"),
-    IDENTITY_TLS_CERT_AUTH_CLIENT_CERTIFICATE_HEADER_KEY: zpStr(z.string().optional()).default(
-      "x-identity-tls-cert-auth-client-cert"
-    ),
     WORKFLOW_SLACK_CLIENT_ID: zpStr(z.string().optional()),
     WORKFLOW_SLACK_CLIENT_SECRET: zpStr(z.string().optional()),
     ENABLE_MSSQL_SECRET_ROTATION_ENCRYPT: zodStrBool.default("true"),

backend/src/queue/queue-service.ts

@@ -62,8 +62,7 @@ export enum QueueName {
   SecretRotationV2 = "secret-rotation-v2",
   FolderTreeCheckpoint = "folder-tree-checkpoint",
   InvalidateCache = "invalidate-cache",
-  SecretScanningV2 = "secret-scanning-v2",
-  TelemetryAggregatedEvents = "telemetry-aggregated-events"
+  SecretScanningV2 = "secret-scanning-v2"
 }
 
 export enum QueueJobs {
@@ -102,8 +101,7 @@ export enum QueueJobs {
   SecretScanningV2DiffScan = "secret-scanning-v2-diff-scan",
   SecretScanningV2SendNotification = "secret-scanning-v2-notification",
   CaOrderCertificateForSubscriber = "ca-order-certificate-for-subscriber",
-  PkiSubscriberDailyAutoRenewal = "pki-subscriber-daily-auto-renewal",
-  TelemetryAggregatedEvents = "telemetry-aggregated-events"
+  PkiSubscriberDailyAutoRenewal = "pki-subscriber-daily-auto-renewal"
 }
 
 export type TQueueJobTypes = {
@@ -294,10 +292,6 @@ export type TQueueJobTypes = {
     name: QueueJobs.PkiSubscriberDailyAutoRenewal;
     payload: undefined;
   };
-  [QueueName.TelemetryAggregatedEvents]: {
-    name: QueueJobs.TelemetryAggregatedEvents;
-    payload: undefined;
-  };
 };
 
 const SECRET_SCANNING_JOBS = [

backend/src/server/routes/index.ts

@@ -193,8 +193,6 @@ import { identityOidcAuthServiceFactory } from "@app/services/identity-oidc-auth
 import { identityProjectDALFactory } from "@app/services/identity-project/identity-project-dal";
 import { identityProjectMembershipRoleDALFactory } from "@app/services/identity-project/identity-project-membership-role-dal";
 import { identityProjectServiceFactory } from "@app/services/identity-project/identity-project-service";
-import { identityTlsCertAuthDALFactory } from "@app/services/identity-tls-cert-auth/identity-tls-cert-auth-dal";
-import { identityTlsCertAuthServiceFactory } from "@app/services/identity-tls-cert-auth/identity-tls-cert-auth-service";
 import { identityTokenAuthDALFactory } from "@app/services/identity-token-auth/identity-token-auth-dal";
 import { identityTokenAuthServiceFactory } from "@app/services/identity-token-auth/identity-token-auth-service";
 import { identityUaClientSecretDALFactory } from "@app/services/identity-ua/identity-ua-client-secret-dal";
@@ -386,7 +384,6 @@ export const registerRoutes = async (
   const identityKubernetesAuthDAL = identityKubernetesAuthDALFactory(db);
   const identityUaClientSecretDAL = identityUaClientSecretDALFactory(db);
   const identityAliCloudAuthDAL = identityAliCloudAuthDALFactory(db);
-  const identityTlsCertAuthDAL = identityTlsCertAuthDALFactory(db);
   const identityAwsAuthDAL = identityAwsAuthDALFactory(db);
   const identityGcpAuthDAL = identityGcpAuthDALFactory(db);
   const identityOciAuthDAL = identityOciAuthDALFactory(db);
@@ -687,8 +684,7 @@ export const registerRoutes = async (
   const telemetryQueue = telemetryQueueServiceFactory({
     keyStore,
     telemetryDAL,
-    queueService,
-    telemetryService
+    queueService
   });
 
   const invalidateCacheQueue = invalidateCacheQueueFactory({
@@ -1495,15 +1491,6 @@ export const registerRoutes = async (
     permissionService
   });
 
-  const identityTlsCertAuthService = identityTlsCertAuthServiceFactory({
-    identityAccessTokenDAL,
-    identityTlsCertAuthDAL,
-    identityOrgMembershipDAL,
-    licenseService,
-    permissionService,
-    kmsService
-  });
-
   const identityAwsAuthService = identityAwsAuthServiceFactory({
     identityAccessTokenDAL,
     identityAwsAuthDAL,
@@ -1958,7 +1945,6 @@ export const registerRoutes = async (
     identityAwsAuth: identityAwsAuthService,
     identityAzureAuth: identityAzureAuthService,
     identityOciAuth: identityOciAuthService,
-    identityTlsCertAuth: identityTlsCertAuthService,
     identityOidcAuth: identityOidcAuthService,
     identityJwtAuth: identityJwtAuthService,
     identityLdapAuth: identityLdapAuthService,

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

@@ -722,7 +722,6 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.InvalidateCache,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           ...req.auditLogInfo

backend/src/server/routes/v1/certificate-authority-router.ts

@@ -692,7 +692,6 @@ export const registerCaRouter = async (server: FastifyZodProvider) => {
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueCert,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           caId: ca.id,
@@ -787,7 +786,6 @@ export const registerCaRouter = async (server: FastifyZodProvider) => {
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SignCert,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           caId: ca.id,

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

@@ -266,7 +266,6 @@ export const registerCertRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueCert,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           caId: req.body.caId,
           certificateTemplateId: req.body.certificateTemplateId,
@@ -443,7 +442,6 @@ export const registerCertRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SignCert,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           caId: req.body.caId,
           certificateTemplateId: req.body.certificateTemplateId,

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

@@ -475,7 +475,6 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
               await server.services.telemetry.sendPostHogEvents({
                 event: PostHogEventTypes.SecretPulled,
                 distinctId: getTelemetryDistinctId(req),
-                organizationId: req.permission.orgId,
                 properties: {
                   numberOfSecrets: secretCountFromEnv,
                   workspaceId: projectId,
@@ -980,7 +979,6 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
           await server.services.telemetry.sendPostHogEvents({
             event: PostHogEventTypes.SecretPulled,
             distinctId: getTelemetryDistinctId(req),
-            organizationId: req.permission.orgId,
             properties: {
               numberOfSecrets: secretCount,
               workspaceId: projectId,
@@ -1146,7 +1144,6 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
             await server.services.telemetry.sendPostHogEvents({
               event: PostHogEventTypes.SecretPulled,
               distinctId: getTelemetryDistinctId(req),
-              organizationId: req.permission.orgId,
               properties: {
                 numberOfSecrets: secretCountForEnv,
                 workspaceId: projectId,
@@ -1339,7 +1336,6 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
         await server.services.telemetry.sendPostHogEvents({
           event: PostHogEventTypes.SecretPulled,
           distinctId: getTelemetryDistinctId(req),
-          organizationId: req.permission.orgId,
           properties: {
             numberOfSecrets: secrets.length,
             workspaceId: projectId,

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

@@ -85,7 +85,6 @@ export const registerIdentityRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.MachineIdentityCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           orgId: req.body.organizationId,
           name: identity.name,

backend/src/server/routes/v1/identity-tls-cert-auth-router.ts

@@ -1,396 +0,0 @@
-import crypto from "node:crypto";
-
-import { z } from "zod";
-
-import { IdentityTlsCertAuthsSchema } from "@app/db/schemas";
-import { EventType } from "@app/ee/services/audit-log/audit-log-types";
-import { ApiDocsTags, TLS_CERT_AUTH } from "@app/lib/api-docs";
-import { getConfig } from "@app/lib/config/env";
-import { BadRequestError } from "@app/lib/errors";
-import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
-import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
-import { AuthMode } from "@app/services/auth/auth-type";
-import { TIdentityTrustedIp } from "@app/services/identity/identity-types";
-import { isSuperAdmin } from "@app/services/super-admin/super-admin-fns";
-
-const validateCommonNames = z
-  .string()
-  .min(1)
-  .trim()
-  .transform((el) =>
-    el
-      .split(",")
-      .map((i) => i.trim())
-      .join(",")
-  );
-
-const validateCaCertificate = (caCert: string) => {
-  if (!caCert) return true;
-  try {
-    // eslint-disable-next-line no-new
-    new crypto.X509Certificate(caCert);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
-
-export const registerIdentityTlsCertAuthRouter = async (server: FastifyZodProvider) => {
-  server.route({
-    method: "POST",
-    url: "/login",
-    config: {
-      rateLimit: writeLimit
-    },
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.TlsCertAuth],
-      description: "Login with TLS Certificate Auth",
-      body: z.object({
-        identityId: z.string().trim().describe(TLS_CERT_AUTH.LOGIN.identityId)
-      }),
-      response: {
-        200: z.object({
-          accessToken: z.string(),
-          expiresIn: z.coerce.number(),
-          accessTokenMaxTTL: z.coerce.number(),
-          tokenType: z.literal("Bearer")
-        })
-      }
-    },
-    handler: async (req) => {
-      const appCfg = getConfig();
-      const clientCertificate = req.headers[appCfg.IDENTITY_TLS_CERT_AUTH_CLIENT_CERTIFICATE_HEADER_KEY];
-      if (!clientCertificate) {
-        throw new BadRequestError({ message: "Missing TLS certificate in header" });
-      }
-
-      const { identityTlsCertAuth, accessToken, identityAccessToken, identityMembershipOrg } =
-        await server.services.identityTlsCertAuth.login({
-          identityId: req.body.identityId,
-          clientCertificate: clientCertificate as string
-        });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: identityMembershipOrg?.orgId,
-        event: {
-          type: EventType.LOGIN_IDENTITY_TLS_CERT_AUTH,
-          metadata: {
-            identityId: identityTlsCertAuth.identityId,
-            identityAccessTokenId: identityAccessToken.id,
-            identityTlsCertAuthId: identityTlsCertAuth.id
-          }
-        }
-      });
-
-      return {
-        accessToken,
-        tokenType: "Bearer" as const,
-        expiresIn: identityTlsCertAuth.accessTokenTTL,
-        accessTokenMaxTTL: identityTlsCertAuth.accessTokenMaxTTL
-      };
-    }
-  });
-
-  server.route({
-    method: "POST",
-    url: "/identities/:identityId",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.TlsCertAuth],
-      description: "Attach TLS Certificate Auth configuration onto identity",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        identityId: z.string().trim().describe(TLS_CERT_AUTH.ATTACH.identityId)
-      }),
-      body: z
-        .object({
-          allowedCommonNames: validateCommonNames
-            .optional()
-            .nullable()
-            .describe(TLS_CERT_AUTH.ATTACH.allowedCommonNames),
-          caCertificate: z
-            .string()
-            .min(1)
-            .max(10240)
-            .refine(validateCaCertificate, "Invalid CA Certificate.")
-            .describe(TLS_CERT_AUTH.ATTACH.caCertificate),
-          accessTokenTrustedIps: z
-            .object({
-              ipAddress: z.string().trim()
-            })
-            .array()
-            .min(1)
-            .default([{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }])
-            .describe(TLS_CERT_AUTH.ATTACH.accessTokenTrustedIps),
-          accessTokenTTL: z
-            .number()
-            .int()
-            .min(0)
-            .max(315360000)
-            .default(2592000)
-            .describe(TLS_CERT_AUTH.ATTACH.accessTokenTTL),
-          accessTokenMaxTTL: z
-            .number()
-            .int()
-            .min(1)
-            .max(315360000)
-            .default(2592000)
-            .describe(TLS_CERT_AUTH.ATTACH.accessTokenMaxTTL),
-          accessTokenNumUsesLimit: z
-            .number()
-            .int()
-            .min(0)
-            .default(0)
-            .describe(TLS_CERT_AUTH.ATTACH.accessTokenNumUsesLimit)
-        })
-        .refine(
-          (val) => val.accessTokenTTL <= val.accessTokenMaxTTL,
-          "Access Token TTL cannot be greater than Access Token Max TTL."
-        ),
-      response: {
-        200: z.object({
-          identityTlsCertAuth: IdentityTlsCertAuthsSchema
-        })
-      }
-    },
-    handler: async (req) => {
-      const identityTlsCertAuth = await server.services.identityTlsCertAuth.attachTlsCertAuth({
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        ...req.body,
-        identityId: req.params.identityId,
-        isActorSuperAdmin: isSuperAdmin(req.auth)
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.ADD_IDENTITY_TLS_CERT_AUTH,
-          metadata: {
-            identityId: identityTlsCertAuth.identityId,
-            allowedCommonNames: identityTlsCertAuth.allowedCommonNames,
-            accessTokenTTL: identityTlsCertAuth.accessTokenTTL,
-            accessTokenMaxTTL: identityTlsCertAuth.accessTokenMaxTTL,
-            accessTokenTrustedIps: identityTlsCertAuth.accessTokenTrustedIps as TIdentityTrustedIp[],
-            accessTokenNumUsesLimit: identityTlsCertAuth.accessTokenNumUsesLimit
-          }
-        }
-      });
-
-      return { identityTlsCertAuth };
-    }
-  });
-
-  server.route({
-    method: "PATCH",
-    url: "/identities/:identityId",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.TlsCertAuth],
-      description: "Update TLS Certificate Auth configuration on identity",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        identityId: z.string().describe(TLS_CERT_AUTH.UPDATE.identityId)
-      }),
-      body: z
-        .object({
-          caCertificate: z
-            .string()
-            .min(1)
-            .max(10240)
-            .refine(validateCaCertificate, "Invalid CA Certificate.")
-            .optional()
-            .describe(TLS_CERT_AUTH.UPDATE.caCertificate),
-          allowedCommonNames: validateCommonNames
-            .optional()
-            .nullable()
-            .describe(TLS_CERT_AUTH.UPDATE.allowedCommonNames),
-          accessTokenTrustedIps: z
-            .object({
-              ipAddress: z.string().trim()
-            })
-            .array()
-            .min(1)
-            .optional()
-            .describe(TLS_CERT_AUTH.UPDATE.accessTokenTrustedIps),
-          accessTokenTTL: z
-            .number()
-            .int()
-            .min(0)
-            .max(315360000)
-            .optional()
-            .describe(TLS_CERT_AUTH.UPDATE.accessTokenTTL),
-          accessTokenNumUsesLimit: z
-            .number()
-            .int()
-            .min(0)
-            .optional()
-            .describe(TLS_CERT_AUTH.UPDATE.accessTokenNumUsesLimit),
-          accessTokenMaxTTL: z
-            .number()
-            .int()
-            .max(315360000)
-            .min(0)
-            .optional()
-            .describe(TLS_CERT_AUTH.UPDATE.accessTokenMaxTTL)
-        })
-        .refine(
-          (val) => (val.accessTokenMaxTTL && val.accessTokenTTL ? val.accessTokenTTL <= val.accessTokenMaxTTL : true),
-          "Access Token TTL cannot be greater than Access Token Max TTL."
-        ),
-      response: {
-        200: z.object({
-          identityTlsCertAuth: IdentityTlsCertAuthsSchema
-        })
-      }
-    },
-    handler: async (req) => {
-      const identityTlsCertAuth = await server.services.identityTlsCertAuth.updateTlsCertAuth({
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        ...req.body,
-        identityId: req.params.identityId
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.UPDATE_IDENTITY_TLS_CERT_AUTH,
-          metadata: {
-            identityId: identityTlsCertAuth.identityId,
-            allowedCommonNames: identityTlsCertAuth.allowedCommonNames,
-            accessTokenTTL: identityTlsCertAuth.accessTokenTTL,
-            accessTokenMaxTTL: identityTlsCertAuth.accessTokenMaxTTL,
-            accessTokenTrustedIps: identityTlsCertAuth.accessTokenTrustedIps as TIdentityTrustedIp[],
-            accessTokenNumUsesLimit: identityTlsCertAuth.accessTokenNumUsesLimit
-          }
-        }
-      });
-
-      return { identityTlsCertAuth };
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/identities/:identityId",
-    config: {
-      rateLimit: readLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.TlsCertAuth],
-      description: "Retrieve TLS Certificate Auth configuration on identity",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        identityId: z.string().describe(TLS_CERT_AUTH.RETRIEVE.identityId)
-      }),
-      response: {
-        200: z.object({
-          identityTlsCertAuth: IdentityTlsCertAuthsSchema.extend({
-            caCertificate: z.string()
-          })
-        })
-      }
-    },
-    handler: async (req) => {
-      const identityTlsCertAuth = await server.services.identityTlsCertAuth.getTlsCertAuth({
-        identityId: req.params.identityId,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorOrgId: req.permission.orgId,
-        actorAuthMethod: req.permission.authMethod
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.GET_IDENTITY_TLS_CERT_AUTH,
-          metadata: {
-            identityId: identityTlsCertAuth.identityId
-          }
-        }
-      });
-      return { identityTlsCertAuth };
-    }
-  });
-
-  server.route({
-    method: "DELETE",
-    url: "/identities/:identityId",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.TlsCertAuth],
-      description: "Delete TLS Certificate Auth configuration on identity",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        identityId: z.string().describe(TLS_CERT_AUTH.REVOKE.identityId)
-      }),
-      response: {
-        200: z.object({
-          identityTlsCertAuth: IdentityTlsCertAuthsSchema
-        })
-      }
-    },
-    handler: async (req) => {
-      const identityTlsCertAuth = await server.services.identityTlsCertAuth.revokeTlsCertAuth({
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        identityId: req.params.identityId
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.REVOKE_IDENTITY_TLS_CERT_AUTH,
-          metadata: {
-            identityId: identityTlsCertAuth.identityId
-          }
-        }
-      });
-
-      return { identityTlsCertAuth };
-    }
-  });
-};

backend/src/server/routes/v1/index.ts

@@ -25,7 +25,6 @@ import { registerIdentityLdapAuthRouter } from "./identity-ldap-auth-router";
 import { registerIdentityOciAuthRouter } from "./identity-oci-auth-router";
 import { registerIdentityOidcAuthRouter } from "./identity-oidc-auth-router";
 import { registerIdentityRouter } from "./identity-router";
-import { registerIdentityTlsCertAuthRouter } from "./identity-tls-cert-auth-router";
 import { registerIdentityTokenAuthRouter } from "./identity-token-auth-router";
 import { registerIdentityUaRouter } from "./identity-universal-auth-router";
 import { registerIntegrationAuthRouter } from "./integration-auth-router";
@@ -67,7 +66,6 @@ export const registerV1Routes = async (server: FastifyZodProvider) => {
       await authRouter.register(registerIdentityAccessTokenRouter);
       await authRouter.register(registerIdentityAliCloudAuthRouter);
       await authRouter.register(registerIdentityAwsAuthRouter);
-      await authRouter.register(registerIdentityTlsCertAuthRouter, { prefix: "/tls-cert-auth" });
       await authRouter.register(registerIdentityAzureAuthRouter);
       await authRouter.register(registerIdentityOciAuthRouter);
       await authRouter.register(registerIdentityOidcAuthRouter);

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

@@ -103,7 +103,6 @@ export const registerIntegrationRouter = async (server: FastifyZodProvider) => {
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IntegrationCreated,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           ...createIntegrationEventProperty,

backend/src/server/routes/v1/invite-org-router.ts

@@ -64,7 +64,6 @@ export const registerInviteOrgRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.UserOrgInvitation,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           inviteeEmails: req.body.inviteeEmails,
           organizationRoleSlug: req.body.organizationRoleSlug,

backend/src/server/routes/v1/pki-subscriber-router.ts

@@ -331,7 +331,6 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) =>
 
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueCert,
-        organizationId: req.permission.orgId,
         distinctId: getTelemetryDistinctId(req),
         properties: {
           subscriberId: subscriber.id,
@@ -400,7 +399,6 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) =>
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.IssueCert,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           subscriberId: subscriber.id,
           commonName: subscriber.commonName,
@@ -473,7 +471,6 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) =>
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SignCert,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           subscriberId: subscriber.id,
           commonName: subscriber.commonName,

backend/src/server/routes/v1/secret-requests-router.ts

@@ -165,7 +165,6 @@ export const registerSecretRequestsRouter = async (server: FastifyZodProvider) =
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretRequestDeleted,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           secretRequestId: req.params.id,
           organizationId: req.permission.orgId,
@@ -257,7 +256,6 @@ export const registerSecretRequestsRouter = async (server: FastifyZodProvider) =
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretRequestCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           secretRequestId: shareRequest.id,
           organizationId: req.permission.orgId,

backend/src/server/routes/v2/project-router.ts

@@ -198,7 +198,6 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.ProjectCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           orgId: project.orgId,
           name: project.name,

backend/src/server/routes/v3/secret-router.ts

@@ -333,7 +333,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
         await server.services.telemetry.sendPostHogEvents({
           event: PostHogEventTypes.SecretPulled,
           distinctId: getTelemetryDistinctId(req),
-          organizationId: req.permission.orgId,
           properties: {
             numberOfSecrets: secrets.length,
             workspaceId,
@@ -490,7 +489,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       if (getUserAgentType(req.headers["user-agent"]) !== UserAgentType.K8_OPERATOR) {
         await server.services.telemetry.sendPostHogEvents({
           event: PostHogEventTypes.SecretPulled,
-          organizationId: req.permission.orgId,
           distinctId: getTelemetryDistinctId(req),
           properties: {
             numberOfSecrets: 1,
@@ -617,7 +615,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: projectId,
@@ -753,7 +750,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretUpdated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: projectId,
@@ -854,7 +850,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretDeleted,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: projectId,
@@ -962,7 +957,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
         await server.services.telemetry.sendPostHogEvents({
           event: PostHogEventTypes.SecretPulled,
           distinctId: getTelemetryDistinctId(req),
-          organizationId: req.permission.orgId,
           properties: {
             numberOfSecrets: secrets.length,
             workspaceId: req.query.workspaceId,
@@ -1042,7 +1036,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
         await server.services.telemetry.sendPostHogEvents({
           event: PostHogEventTypes.SecretPulled,
           distinctId: getTelemetryDistinctId(req),
-          organizationId: req.permission.orgId,
           properties: {
             numberOfSecrets: 1,
             workspaceId: req.query.workspaceId,
@@ -1214,7 +1207,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: req.body.workspaceId,
@@ -1404,7 +1396,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretUpdated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: req.body.workspaceId,
@@ -1528,7 +1519,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretDeleted,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: 1,
           workspaceId: req.body.workspaceId,
@@ -1712,7 +1702,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: req.body.workspaceId,
@@ -1839,7 +1828,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretUpdated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: req.body.workspaceId,
@@ -1958,7 +1946,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretDeleted,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: req.body.workspaceId,
@@ -2067,7 +2054,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretCreated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: secrets[0].workspace,
@@ -2223,7 +2209,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretUpdated,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: secrets[0].workspace,
@@ -2322,7 +2307,6 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       await server.services.telemetry.sendPostHogEvents({
         event: PostHogEventTypes.SecretDeleted,
         distinctId: getTelemetryDistinctId(req),
-        organizationId: req.permission.orgId,
         properties: {
           numberOfSecrets: secrets.length,
           workspaceId: secrets[0].workspace,

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

@@ -1,3 +1,4 @@
+import { logger } from "@app/lib/logger";
 import { OrgServiceActor } from "@app/lib/types";
 
 import { AppConnection } from "../app-connection-enums";
@@ -19,6 +20,7 @@ export const gcpConnectionService = (getAppConnection: TGetAppConnectionFunc) =>
 
       return projects;
     } catch (error) {
+      logger.error(error, "Error listing GCP secret manager projects");
       return [];
     }
   };

backend/src/services/identity-access-token/identity-access-token-dal.ts

@@ -45,11 +45,6 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
         .leftJoin(TableName.IdentityOidcAuth, `${TableName.Identity}.id`, `${TableName.IdentityOidcAuth}.identityId`)
         .leftJoin(TableName.IdentityTokenAuth, `${TableName.Identity}.id`, `${TableName.IdentityTokenAuth}.identityId`)
         .leftJoin(TableName.IdentityJwtAuth, `${TableName.Identity}.id`, `${TableName.IdentityJwtAuth}.identityId`)
-        .leftJoin(
-          TableName.IdentityTlsCertAuth,
-          `${TableName.Identity}.id`,
-          `${TableName.IdentityTlsCertAuth}.identityId`
-        )
         .select(selectAllTableCols(TableName.IdentityAccessToken))
         .select(
           db.ref("accessTokenTrustedIps").withSchema(TableName.IdentityUniversalAuth).as("accessTokenTrustedIpsUa"),
@@ -66,7 +61,6 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
           db.ref("accessTokenTrustedIps").withSchema(TableName.IdentityTokenAuth).as("accessTokenTrustedIpsToken"),
           db.ref("accessTokenTrustedIps").withSchema(TableName.IdentityJwtAuth).as("accessTokenTrustedIpsJwt"),
           db.ref("accessTokenTrustedIps").withSchema(TableName.IdentityLdapAuth).as("accessTokenTrustedIpsLdap"),
-          db.ref("accessTokenTrustedIps").withSchema(TableName.IdentityTlsCertAuth).as("accessTokenTrustedIpsTlsCert"),
           db.ref("name").withSchema(TableName.Identity)
         )
         .first();
@@ -85,8 +79,7 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
         trustedIpsOidcAuth: doc.accessTokenTrustedIpsOidc,
         trustedIpsAccessTokenAuth: doc.accessTokenTrustedIpsToken,
         trustedIpsAccessJwtAuth: doc.accessTokenTrustedIpsJwt,
-        trustedIpsAccessLdapAuth: doc.accessTokenTrustedIpsLdap,
-        trustedIpsAccessTlsCertAuth: doc.accessTokenTrustedIpsTlsCert
+        trustedIpsAccessLdapAuth: doc.accessTokenTrustedIpsLdap
       };
     } catch (error) {
       throw new DatabaseError({ error, name: "IdAccessTokenFindOne" });

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

@@ -201,8 +201,7 @@ export const identityAccessTokenServiceFactory = ({
       [IdentityAuthMethod.OIDC_AUTH]: identityAccessToken.trustedIpsOidcAuth,
       [IdentityAuthMethod.TOKEN_AUTH]: identityAccessToken.trustedIpsAccessTokenAuth,
       [IdentityAuthMethod.JWT_AUTH]: identityAccessToken.trustedIpsAccessJwtAuth,
-      [IdentityAuthMethod.LDAP_AUTH]: identityAccessToken.trustedIpsAccessLdapAuth,
-      [IdentityAuthMethod.TLS_CERT_AUTH]: identityAccessToken.trustedIpsAccessTlsCertAuth
+      [IdentityAuthMethod.LDAP_AUTH]: identityAccessToken.trustedIpsAccessLdapAuth
     };
 
     const trustedIps = trustedIpsMap[identityAccessToken.authMethod as IdentityAuthMethod];

backend/src/services/identity-tls-cert-auth/identity-tls-cert-auth-dal.ts

@@ -1,10 +0,0 @@
-import { TDbClient } from "@app/db";
-import { TableName } from "@app/db/schemas";
-import { ormify, TOrmify } from "@app/lib/knex";
-
-export type TIdentityTlsCertAuthDALFactory = TOrmify<TableName.IdentityTlsCertAuth>;
-
-export const identityTlsCertAuthDALFactory = (db: TDbClient) => {
-  const orm = ormify(db, TableName.IdentityTlsCertAuth);
-  return orm;
-};

backend/src/services/identity-tls-cert-auth/identity-tls-cert-auth-service.ts

@@ -1,423 +0,0 @@
-import crypto from "node:crypto";
-
-import { ForbiddenError } from "@casl/ability";
-import jwt from "jsonwebtoken";
-
-import { IdentityAuthMethod } from "@app/db/schemas";
-import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
-import { OrgPermissionIdentityActions, OrgPermissionSubjects } from "@app/ee/services/permission/org-permission";
-import {
-  constructPermissionErrorMessage,
-  validatePrivilegeChangeOperation
-} from "@app/ee/services/permission/permission-fns";
-import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
-import { extractX509CertFromChain } from "@app/lib/certificates/extract-certificate";
-import { getConfig } from "@app/lib/config/env";
-import { BadRequestError, NotFoundError, PermissionBoundaryError, UnauthorizedError } from "@app/lib/errors";
-import { extractIPDetails, isValidIpOrCidr } from "@app/lib/ip";
-
-import { ActorType, AuthTokenType } from "../auth/auth-type";
-import { TIdentityOrgDALFactory } from "../identity/identity-org-dal";
-import { TIdentityAccessTokenDALFactory } from "../identity-access-token/identity-access-token-dal";
-import { TIdentityAccessTokenJwtPayload } from "../identity-access-token/identity-access-token-types";
-import { TKmsServiceFactory } from "../kms/kms-service";
-import { KmsDataKey } from "../kms/kms-types";
-import { validateIdentityUpdateForSuperAdminPrivileges } from "../super-admin/super-admin-fns";
-import { TIdentityTlsCertAuthDALFactory } from "./identity-tls-cert-auth-dal";
-import { TIdentityTlsCertAuthServiceFactory } from "./identity-tls-cert-auth-types";
-
-type TIdentityTlsCertAuthServiceFactoryDep = {
-  identityAccessTokenDAL: Pick<TIdentityAccessTokenDALFactory, "create" | "delete">;
-  identityTlsCertAuthDAL: Pick<
-    TIdentityTlsCertAuthDALFactory,
-    "findOne" | "transaction" | "create" | "updateById" | "delete"
-  >;
-  identityOrgMembershipDAL: Pick<TIdentityOrgDALFactory, "findOne">;
-  licenseService: Pick<TLicenseServiceFactory, "getPlan">;
-  permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
-  kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
-};
-
-const parseSubjectDetails = (data: string) => {
-  const values: Record<string, string> = {};
-  data.split("\n").forEach((el) => {
-    const [key, value] = el.split("=");
-    values[key.trim()] = value.trim();
-  });
-  return values;
-};
-
-export const identityTlsCertAuthServiceFactory = ({
-  identityAccessTokenDAL,
-  identityTlsCertAuthDAL,
-  identityOrgMembershipDAL,
-  licenseService,
-  permissionService,
-  kmsService
-}: TIdentityTlsCertAuthServiceFactoryDep): TIdentityTlsCertAuthServiceFactory => {
-  const login: TIdentityTlsCertAuthServiceFactory["login"] = async ({ identityId, clientCertificate }) => {
-    const identityTlsCertAuth = await identityTlsCertAuthDAL.findOne({ identityId });
-    if (!identityTlsCertAuth) {
-      throw new NotFoundError({
-        message: "TLS Certificate auth method not found for identity, did you configure TLS Certificate auth?"
-      });
-    }
-
-    const identityMembershipOrg = await identityOrgMembershipDAL.findOne({
-      identityId: identityTlsCertAuth.identityId
-    });
-
-    if (!identityMembershipOrg) {
-      throw new NotFoundError({
-        message: `Identity organization membership for identity with ID '${identityTlsCertAuth.identityId}' not found`
-      });
-    }
-
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: identityMembershipOrg.orgId
-    });
-
-    const caCertificate = decryptor({
-      cipherTextBlob: identityTlsCertAuth.encryptedCaCertificate
-    }).toString();
-
-    const leafCertificate = extractX509CertFromChain(decodeURIComponent(clientCertificate))?.[0];
-    if (!leafCertificate) {
-      throw new BadRequestError({ message: "Missing client certificate" });
-    }
-
-    const clientCertificateX509 = new crypto.X509Certificate(leafCertificate);
-    const caCertificateX509 = new crypto.X509Certificate(caCertificate);
-
-    const isValidCertificate = clientCertificateX509.verify(caCertificateX509.publicKey);
-    if (!isValidCertificate)
-      throw new UnauthorizedError({
-        message: "Access denied: Certificate not issued by the provided CA."
-      });
-
-    if (new Date(clientCertificateX509.validTo) < new Date()) {
-      throw new UnauthorizedError({
-        message: "Access denied: Certificate has expired."
-      });
-    }
-
-    if (new Date(clientCertificateX509.validFrom) > new Date()) {
-      throw new UnauthorizedError({
-        message: "Access denied: Certificate not yet valid."
-      });
-    }
-
-    const subjectDetails = parseSubjectDetails(clientCertificateX509.subject);
-    if (identityTlsCertAuth.allowedCommonNames) {
-      const isValidCommonName = identityTlsCertAuth.allowedCommonNames.split(",").includes(subjectDetails.CN);
-      if (!isValidCommonName) {
-        throw new UnauthorizedError({
-          message: "Access denied: TLS Certificate Auth common name not allowed."
-        });
-      }
-    }
-
-    // Generate the token
-    const identityAccessToken = await identityTlsCertAuthDAL.transaction(async (tx) => {
-      const newToken = await identityAccessTokenDAL.create(
-        {
-          identityId: identityTlsCertAuth.identityId,
-          isAccessTokenRevoked: false,
-          accessTokenTTL: identityTlsCertAuth.accessTokenTTL,
-          accessTokenMaxTTL: identityTlsCertAuth.accessTokenMaxTTL,
-          accessTokenNumUses: 0,
-          accessTokenNumUsesLimit: identityTlsCertAuth.accessTokenNumUsesLimit,
-          authMethod: IdentityAuthMethod.TLS_CERT_AUTH
-        },
-        tx
-      );
-      return newToken;
-    });
-
-    const appCfg = getConfig();
-    const accessToken = jwt.sign(
-      {
-        identityId: identityTlsCertAuth.identityId,
-        identityAccessTokenId: identityAccessToken.id,
-        authTokenType: AuthTokenType.IDENTITY_ACCESS_TOKEN
-      } as TIdentityAccessTokenJwtPayload,
-      appCfg.AUTH_SECRET,
-      Number(identityAccessToken.accessTokenTTL) === 0
-        ? undefined
-        : {
-            expiresIn: Number(identityAccessToken.accessTokenTTL)
-          }
-    );
-
-    return {
-      identityTlsCertAuth,
-      accessToken,
-      identityAccessToken,
-      identityMembershipOrg
-    };
-  };
-
-  const attachTlsCertAuth: TIdentityTlsCertAuthServiceFactory["attachTlsCertAuth"] = async ({
-    identityId,
-    accessTokenTTL,
-    accessTokenMaxTTL,
-    accessTokenNumUsesLimit,
-    accessTokenTrustedIps,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId,
-    isActorSuperAdmin,
-    caCertificate,
-    allowedCommonNames
-  }) => {
-    await validateIdentityUpdateForSuperAdminPrivileges(identityId, isActorSuperAdmin);
-
-    const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId });
-    if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` });
-
-    if (identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.TLS_CERT_AUTH)) {
-      throw new BadRequestError({
-        message: "Failed to add TLS Certificate Auth to already configured identity"
-      });
-    }
-
-    if (accessTokenMaxTTL > 0 && accessTokenTTL > accessTokenMaxTTL) {
-      throw new BadRequestError({ message: "Access token TTL cannot be greater than max TTL" });
-    }
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      identityMembershipOrg.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(OrgPermissionIdentityActions.Create, OrgPermissionSubjects.Identity);
-
-    const plan = await licenseService.getPlan(identityMembershipOrg.orgId);
-    const reformattedAccessTokenTrustedIps = accessTokenTrustedIps.map((accessTokenTrustedIp) => {
-      if (
-        !plan.ipAllowlisting &&
-        accessTokenTrustedIp.ipAddress !== "0.0.0.0/0" &&
-        accessTokenTrustedIp.ipAddress !== "::/0"
-      )
-        throw new BadRequestError({
-          message:
-            "Failed to add IP access range to access token due to plan restriction. Upgrade plan to add IP access range."
-        });
-      if (!isValidIpOrCidr(accessTokenTrustedIp.ipAddress))
-        throw new BadRequestError({
-          message: "The IP is not a valid IPv4, IPv6, or CIDR block"
-        });
-      return extractIPDetails(accessTokenTrustedIp.ipAddress);
-    });
-
-    const { encryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: identityMembershipOrg.orgId
-    });
-
-    const identityTlsCertAuth = await identityTlsCertAuthDAL.transaction(async (tx) => {
-      const doc = await identityTlsCertAuthDAL.create(
-        {
-          identityId: identityMembershipOrg.identityId,
-          accessTokenMaxTTL,
-          allowedCommonNames,
-          accessTokenTTL,
-          encryptedCaCertificate: encryptor({ plainText: Buffer.from(caCertificate) }).cipherTextBlob,
-          accessTokenNumUsesLimit,
-          accessTokenTrustedIps: JSON.stringify(reformattedAccessTokenTrustedIps)
-        },
-        tx
-      );
-      return doc;
-    });
-    return { ...identityTlsCertAuth, orgId: identityMembershipOrg.orgId };
-  };
-
-  const updateTlsCertAuth: TIdentityTlsCertAuthServiceFactory["updateTlsCertAuth"] = async ({
-    identityId,
-    caCertificate,
-    allowedCommonNames,
-    accessTokenTTL,
-    accessTokenMaxTTL,
-    accessTokenNumUsesLimit,
-    accessTokenTrustedIps,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }) => {
-    const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId });
-    if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` });
-
-    if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.TLS_CERT_AUTH)) {
-      throw new NotFoundError({
-        message: "The identity does not have TLS Certificate Auth attached"
-      });
-    }
-
-    const identityTlsCertAuth = await identityTlsCertAuthDAL.findOne({ identityId });
-
-    if (
-      (accessTokenMaxTTL || identityTlsCertAuth.accessTokenMaxTTL) > 0 &&
-      (accessTokenTTL || identityTlsCertAuth.accessTokenTTL) >
-        (accessTokenMaxTTL || identityTlsCertAuth.accessTokenMaxTTL)
-    ) {
-      throw new BadRequestError({ message: "Access token TTL cannot be greater than max TTL" });
-    }
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      identityMembershipOrg.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(OrgPermissionIdentityActions.Edit, OrgPermissionSubjects.Identity);
-
-    const plan = await licenseService.getPlan(identityMembershipOrg.orgId);
-    const reformattedAccessTokenTrustedIps = accessTokenTrustedIps?.map((accessTokenTrustedIp) => {
-      if (
-        !plan.ipAllowlisting &&
-        accessTokenTrustedIp.ipAddress !== "0.0.0.0/0" &&
-        accessTokenTrustedIp.ipAddress !== "::/0"
-      )
-        throw new BadRequestError({
-          message:
-            "Failed to add IP access range to access token due to plan restriction. Upgrade plan to add IP access range."
-        });
-      if (!isValidIpOrCidr(accessTokenTrustedIp.ipAddress))
-        throw new BadRequestError({
-          message: "The IP is not a valid IPv4, IPv6, or CIDR block"
-        });
-      return extractIPDetails(accessTokenTrustedIp.ipAddress);
-    });
-    const { encryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: identityMembershipOrg.orgId
-    });
-
-    const updatedTlsCertAuth = await identityTlsCertAuthDAL.updateById(identityTlsCertAuth.id, {
-      allowedCommonNames,
-      encryptedCaCertificate: caCertificate
-        ? encryptor({ plainText: Buffer.from(caCertificate) }).cipherTextBlob
-        : undefined,
-      accessTokenMaxTTL,
-      accessTokenTTL,
-      accessTokenNumUsesLimit,
-      accessTokenTrustedIps: reformattedAccessTokenTrustedIps
-        ? JSON.stringify(reformattedAccessTokenTrustedIps)
-        : undefined
-    });
-
-    return { ...updatedTlsCertAuth, orgId: identityMembershipOrg.orgId };
-  };
-
-  const getTlsCertAuth: TIdentityTlsCertAuthServiceFactory["getTlsCertAuth"] = async ({
-    identityId,
-    actorId,
-    actor,
-    actorAuthMethod,
-    actorOrgId
-  }) => {
-    const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId });
-    if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` });
-
-    if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.TLS_CERT_AUTH)) {
-      throw new BadRequestError({
-        message: "The identity does not have TLS Certificate Auth attached"
-      });
-    }
-
-    const identityAuth = await identityTlsCertAuthDAL.findOne({ identityId });
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      identityMembershipOrg.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(OrgPermissionIdentityActions.Read, OrgPermissionSubjects.Identity);
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: identityMembershipOrg.orgId
-    });
-    let caCertificate = "";
-    if (identityAuth.encryptedCaCertificate) {
-      caCertificate = decryptor({ cipherTextBlob: identityAuth.encryptedCaCertificate }).toString();
-    }
-
-    return { ...identityAuth, caCertificate, orgId: identityMembershipOrg.orgId };
-  };
-
-  const revokeTlsCertAuth: TIdentityTlsCertAuthServiceFactory["revokeTlsCertAuth"] = async ({
-    identityId,
-    actorId,
-    actor,
-    actorAuthMethod,
-    actorOrgId
-  }) => {
-    const identityMembershipOrg = await identityOrgMembershipDAL.findOne({ identityId });
-    if (!identityMembershipOrg) throw new NotFoundError({ message: `Failed to find identity with ID ${identityId}` });
-    if (!identityMembershipOrg.identity.authMethods.includes(IdentityAuthMethod.TLS_CERT_AUTH)) {
-      throw new BadRequestError({
-        message: "The identity does not have TLS Certificate auth"
-      });
-    }
-    const { permission, membership } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      identityMembershipOrg.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(OrgPermissionIdentityActions.Edit, OrgPermissionSubjects.Identity);
-
-    const { permission: rolePermission } = await permissionService.getOrgPermission(
-      ActorType.IDENTITY,
-      identityMembershipOrg.identityId,
-      identityMembershipOrg.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-
-    const permissionBoundary = validatePrivilegeChangeOperation(
-      membership.shouldUseNewPrivilegeSystem,
-      OrgPermissionIdentityActions.RevokeAuth,
-      OrgPermissionSubjects.Identity,
-      permission,
-      rolePermission
-    );
-
-    if (!permissionBoundary.isValid)
-      throw new PermissionBoundaryError({
-        message: constructPermissionErrorMessage(
-          "Failed to revoke TLS Certificate auth of identity with more privileged role",
-          membership.shouldUseNewPrivilegeSystem,
-          OrgPermissionIdentityActions.RevokeAuth,
-          OrgPermissionSubjects.Identity
-        ),
-        details: { missingPermissions: permissionBoundary.missingPermissions }
-      });
-
-    const revokedIdentityTlsCertAuth = await identityTlsCertAuthDAL.transaction(async (tx) => {
-      const deletedTlsCertAuth = await identityTlsCertAuthDAL.delete({ identityId }, tx);
-      await identityAccessTokenDAL.delete({ identityId, authMethod: IdentityAuthMethod.TLS_CERT_AUTH }, tx);
-
-      return { ...deletedTlsCertAuth?.[0], orgId: identityMembershipOrg.orgId };
-    });
-    return revokedIdentityTlsCertAuth;
-  };
-
-  return {
-    login,
-    attachTlsCertAuth,
-    updateTlsCertAuth,
-    getTlsCertAuth,
-    revokeTlsCertAuth
-  };
-};

backend/src/services/identity-tls-cert-auth/identity-tls-cert-auth-types.ts

@@ -1,49 +0,0 @@
-import { TIdentityAccessTokens, TIdentityOrgMemberships, TIdentityTlsCertAuths } from "@app/db/schemas";
-import { TProjectPermission } from "@app/lib/types";
-
-export type TLoginTlsCertAuthDTO = {
-  identityId: string;
-  clientCertificate: string;
-};
-
-export type TAttachTlsCertAuthDTO = {
-  identityId: string;
-  caCertificate: string;
-  allowedCommonNames?: string | null;
-  accessTokenTTL: number;
-  accessTokenMaxTTL: number;
-  accessTokenNumUsesLimit: number;
-  accessTokenTrustedIps: { ipAddress: string }[];
-  isActorSuperAdmin?: boolean;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TUpdateTlsCertAuthDTO = {
-  identityId: string;
-  caCertificate?: string;
-  allowedCommonNames?: string | null;
-  accessTokenTTL?: number;
-  accessTokenMaxTTL?: number;
-  accessTokenNumUsesLimit?: number;
-  accessTokenTrustedIps?: { ipAddress: string }[];
-} & Omit<TProjectPermission, "projectId">;
-
-export type TGetTlsCertAuthDTO = {
-  identityId: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TRevokeTlsCertAuthDTO = {
-  identityId: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TIdentityTlsCertAuthServiceFactory = {
-  login: (dto: TLoginTlsCertAuthDTO) => Promise<{
-    identityTlsCertAuth: TIdentityTlsCertAuths;
-    accessToken: string;
-    identityAccessToken: TIdentityAccessTokens;
-    identityMembershipOrg: TIdentityOrgMemberships;
-  }>;
-  attachTlsCertAuth: (dto: TAttachTlsCertAuthDTO) => Promise<TIdentityTlsCertAuths>;
-  updateTlsCertAuth: (dto: TUpdateTlsCertAuthDTO) => Promise<TIdentityTlsCertAuths>;
-  revokeTlsCertAuth: (dto: TRevokeTlsCertAuthDTO) => Promise<TIdentityTlsCertAuths>;
-  getTlsCertAuth: (dto: TGetTlsCertAuthDTO) => Promise<TIdentityTlsCertAuths & { caCertificate: string }>;
-};

backend/src/services/identity/identity-fns.ts

@@ -11,8 +11,7 @@ export const buildAuthMethods = ({
   azureId,
   tokenId,
   jwtId,
-  ldapId,
-  tlsCertId
+  ldapId
 }: {
   uaId?: string;
   gcpId?: string;
@@ -25,7 +24,6 @@ export const buildAuthMethods = ({
   tokenId?: string;
   jwtId?: string;
   ldapId?: string;
-  tlsCertId?: string;
 }) => {
   return [
     ...[uaId ? IdentityAuthMethod.UNIVERSAL_AUTH : null],
@@ -38,7 +36,6 @@ export const buildAuthMethods = ({
     ...[azureId ? IdentityAuthMethod.AZURE_AUTH : null],
     ...[tokenId ? IdentityAuthMethod.TOKEN_AUTH : null],
     ...[jwtId ? IdentityAuthMethod.JWT_AUTH : null],
-    ...[ldapId ? IdentityAuthMethod.LDAP_AUTH : null],
-    ...[tlsCertId ? IdentityAuthMethod.TLS_CERT_AUTH : null]
+    ...[ldapId ? IdentityAuthMethod.LDAP_AUTH : null]
   ].filter((authMethod) => authMethod) as IdentityAuthMethod[];
 };

backend/src/services/identity/identity-org-dal.ts

@@ -12,7 +12,6 @@ import {
   TIdentityOciAuths,
   TIdentityOidcAuths,
   TIdentityOrgMemberships,
-  TIdentityTlsCertAuths,
   TIdentityTokenAuths,
   TIdentityUniversalAuths,
   TOrgRoles
@@ -100,11 +99,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           `${TableName.IdentityOrgMembership}.identityId`,
           `${TableName.IdentityLdapAuth}.identityId`
         )
-        .leftJoin<TIdentityTlsCertAuths>(
-          TableName.IdentityTlsCertAuth,
-          `${TableName.IdentityOrgMembership}.identityId`,
-          `${TableName.IdentityTlsCertAuth}.identityId`
-        )
+
         .select(
           selectAllTableCols(TableName.IdentityOrgMembership),
 
@@ -119,7 +114,6 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           db.ref("id").as("tokenId").withSchema(TableName.IdentityTokenAuth),
           db.ref("id").as("jwtId").withSchema(TableName.IdentityJwtAuth),
           db.ref("id").as("ldapId").withSchema(TableName.IdentityLdapAuth),
-          db.ref("id").as("tlsCertId").withSchema(TableName.IdentityTlsCertAuth),
           db.ref("name").withSchema(TableName.Identity),
           db.ref("hasDeleteProtection").withSchema(TableName.Identity)
         );
@@ -244,11 +238,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           "paginatedIdentity.identityId",
           `${TableName.IdentityLdapAuth}.identityId`
         )
-        .leftJoin<TIdentityTlsCertAuths>(
-          TableName.IdentityTlsCertAuth,
-          "paginatedIdentity.identityId",
-          `${TableName.IdentityTlsCertAuth}.identityId`
-        )
+
         .select(
           db.ref("id").withSchema("paginatedIdentity"),
           db.ref("role").withSchema("paginatedIdentity"),
@@ -270,8 +260,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           db.ref("id").as("azureId").withSchema(TableName.IdentityAzureAuth),
           db.ref("id").as("tokenId").withSchema(TableName.IdentityTokenAuth),
           db.ref("id").as("jwtId").withSchema(TableName.IdentityJwtAuth),
-          db.ref("id").as("ldapId").withSchema(TableName.IdentityLdapAuth),
-          db.ref("id").as("tlsCertId").withSchema(TableName.IdentityTlsCertAuth)
+          db.ref("id").as("ldapId").withSchema(TableName.IdentityLdapAuth)
         )
         // cr stands for custom role
         .select(db.ref("id").as("crId").withSchema(TableName.OrgRoles))
@@ -317,7 +306,6 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           azureId,
           tokenId,
           ldapId,
-          tlsCertId,
           createdAt,
           updatedAt
         }) => ({
@@ -325,6 +313,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
           roleId,
           identityId,
           id,
+
           orgId,
           createdAt,
           updatedAt,
@@ -352,8 +341,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
               azureId,
               tokenId,
               jwtId,
-              ldapId,
-              tlsCertId
+              ldapId
             })
           }
         }),
@@ -392,12 +380,7 @@ export const identityOrgDALFactory = (db: TDbClient) => {
         .join(TableName.Identity, `${TableName.Identity}.id`, `${TableName.IdentityOrgMembership}.identityId`)
         .where(`${TableName.IdentityOrgMembership}.orgId`, orgId)
         .leftJoin(TableName.OrgRoles, `${TableName.IdentityOrgMembership}.roleId`, `${TableName.OrgRoles}.id`)
-        .orderBy(
-          orderBy === OrgIdentityOrderBy.Role
-            ? `${TableName.IdentityOrgMembership}.${orderBy}`
-            : `${TableName.Identity}.${orderBy}`,
-          orderDirection
-        )
+        .orderBy(`${TableName.Identity}.${orderBy}`, orderDirection)
         .select(`${TableName.IdentityOrgMembership}.id`)
         .select<{ id: string; total_count: string }>(
           db.raw(
@@ -528,23 +511,6 @@ export const identityOrgDALFactory = (db: TDbClient) => {
 
       if (orderBy === OrgIdentityOrderBy.Name) {
         void query.orderBy("identityName", orderDirection);
-      } else if (orderBy === OrgIdentityOrderBy.Role) {
-        void query.orderByRaw(
-          `
-          CASE 
-            WHEN ??.role = ? 
-            THEN ??.slug 
-            ELSE ??.role 
-          END ?
-          `,
-          [
-            TableName.IdentityOrgMembership,
-            "custom",
-            TableName.OrgRoles,
-            TableName.IdentityOrgMembership,
-            db.raw(orderDirection)
-          ]
-        );
       }
 
       const docs = await query;

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

@@ -46,8 +46,8 @@ export type TListOrgIdentitiesByOrgIdDTO = {
 } & TOrgPermission;
 
 export enum OrgIdentityOrderBy {
-  Name = "name",
-  Role = "role"
+  Name = "name"
+  // Role = "role"
 }
 
 export type TSearchOrgIdentitiesByOrgIdDAL = {

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

@@ -7,18 +7,13 @@ import { QueueJobs, QueueName, TQueueServiceFactory } from "@app/queue";
 
 import { getServerCfg } from "../super-admin/super-admin-service";
 import { TTelemetryDALFactory } from "./telemetry-dal";
-import {
-  TELEMETRY_SECRET_OPERATIONS_KEY,
-  TELEMETRY_SECRET_PROCESSED_KEY,
-  TTelemetryServiceFactory
-} from "./telemetry-service";
+import { TELEMETRY_SECRET_OPERATIONS_KEY, TELEMETRY_SECRET_PROCESSED_KEY } from "./telemetry-service";
 import { PostHogEventTypes } from "./telemetry-types";
 
 type TTelemetryQueueServiceFactoryDep = {
   queueService: TQueueServiceFactory;
   keyStore: Pick<TKeyStoreFactory, "getItem" | "deleteItem">;
   telemetryDAL: TTelemetryDALFactory;
-  telemetryService: TTelemetryServiceFactory;
 };
 
 export type TTelemetryQueueServiceFactory = ReturnType<typeof telemetryQueueServiceFactory>;
@@ -26,8 +21,7 @@ export type TTelemetryQueueServiceFactory = ReturnType<typeof telemetryQueueServ
 export const telemetryQueueServiceFactory = ({
   queueService,
   keyStore,
-  telemetryDAL,
-  telemetryService
+  telemetryDAL
 }: TTelemetryQueueServiceFactoryDep) => {
   const appCfg = getConfig();
   const postHog =
@@ -54,10 +48,6 @@ export const telemetryQueueServiceFactory = ({
     await keyStore.deleteItem(TELEMETRY_SECRET_OPERATIONS_KEY);
   });
 
-  queueService.start(QueueName.TelemetryAggregatedEvents, async () => {
-    await telemetryService.processAggregatedEvents();
-  });
-
   // every day at midnight a telemetry job executes on self-hosted instances
   // this sends some telemetry information like instance id secrets operated etc
   const startTelemetryCheck = async () => {
@@ -70,26 +60,11 @@ export const telemetryQueueServiceFactory = ({
       { pattern: "0 0 * * *", utc: true },
       QueueName.TelemetryInstanceStats // just a job id
     );
-
-    // clear previous aggregated events job
-    await queueService.stopRepeatableJob(
-      QueueName.TelemetryAggregatedEvents,
-      QueueJobs.TelemetryAggregatedEvents,
-      { pattern: "*/5 * * * *", utc: true },
-      QueueName.TelemetryAggregatedEvents // just a job id
-    );
-
     if (postHog) {
       await queueService.queue(QueueName.TelemetryInstanceStats, QueueJobs.TelemetryInstanceStats, undefined, {
         jobId: QueueName.TelemetryInstanceStats,
         repeat: { pattern: "0 0 * * *", utc: true }
       });
-
-      // Start aggregated events job (runs every five minutes)
-      await queueService.queue(QueueName.TelemetryAggregatedEvents, QueueJobs.TelemetryAggregatedEvents, undefined, {
-        jobId: QueueName.TelemetryAggregatedEvents,
-        repeat: { pattern: "*/5 * * * *", utc: true }
-      });
     }
   };
 
@@ -97,10 +72,6 @@ export const telemetryQueueServiceFactory = ({
     logger.error(err?.failedReason, `${QueueName.TelemetryInstanceStats}: failed`);
   });
 
-  queueService.listen(QueueName.TelemetryAggregatedEvents, "failed", (err) => {
-    logger.error(err?.failedReason, `${QueueName.TelemetryAggregatedEvents}: failed`);
-  });
-
   return {
     startTelemetryCheck
   };

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

@@ -1,4 +1,3 @@
-import { createHash, randomUUID } from "crypto";
 import { PostHog } from "posthog-node";
 
 import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
@@ -13,49 +12,12 @@ import { PostHogEventTypes, TPostHogEvent, TSecretModifiedEvent } from "./teleme
 export const TELEMETRY_SECRET_PROCESSED_KEY = "telemetry-secret-processed";
 export const TELEMETRY_SECRET_OPERATIONS_KEY = "telemetry-secret-operations";
 
-export const POSTHOG_AGGREGATED_EVENTS = [PostHogEventTypes.SecretPulled];
-const TELEMETRY_AGGREGATED_KEY_EXP = 900; // 15mins
-
-// Bucket configuration
-const TELEMETRY_BUCKET_COUNT = 30;
-const TELEMETRY_BUCKET_NAMES = Array.from(
-  { length: TELEMETRY_BUCKET_COUNT },
-  (_, i) => `bucket-${i.toString().padStart(2, "0")}`
-);
-
-type AggregatedEventData = Record<string, unknown>;
-type SingleEventData = {
-  distinctId: string;
-  event: string;
-  properties: unknown;
-  organizationId: string;
-};
-
 export type TTelemetryServiceFactory = ReturnType<typeof telemetryServiceFactory>;
 export type TTelemetryServiceFactoryDep = {
-  keyStore: Pick<
-    TKeyStoreFactory,
-    "incrementBy" | "deleteItemsByKeyIn" | "setItemWithExpiry" | "getKeysByPattern" | "getItems"
-  >;
+  keyStore: Pick<TKeyStoreFactory, "getItem" | "incrementBy">;
   licenseService: Pick<TLicenseServiceFactory, "getInstanceType">;
 };
 
-const getBucketForDistinctId = (distinctId: string): string => {
-  // Use SHA-256 hash for consistent distribution
-  const hash = createHash("sha256").update(distinctId).digest("hex");
-
-  // Take first 8 characters and convert to number for better distribution
-  const hashNumber = parseInt(hash.substring(0, 8), 16);
-  const bucketIndex = hashNumber % TELEMETRY_BUCKET_COUNT;
-
-  return TELEMETRY_BUCKET_NAMES[bucketIndex];
-};
-
-export const createTelemetryEventKey = (event: string, distinctId: string): string => {
-  const bucketId = getBucketForDistinctId(distinctId);
-  return `telemetry-event-${event}-${bucketId}-${distinctId}-${randomUUID()}`;
-};
-
 export const telemetryServiceFactory = ({ keyStore, licenseService }: TTelemetryServiceFactoryDep) => {
   const appCfg = getConfig();
 
@@ -102,33 +64,11 @@ To opt into telemetry, you can set "TELEMETRY_ENABLED=true" within the environme
       const instanceType = licenseService.getInstanceType();
       // capture posthog only when its cloud or signup event happens in self-hosted
       if (instanceType === InstanceType.Cloud || event.event === PostHogEventTypes.UserSignedUp) {
-        if (event.organizationId) {
-          try {
-            postHog.groupIdentify({ groupType: "organization", groupKey: event.organizationId });
-          } catch (error) {
-            logger.error(error, "Failed to identify PostHog organization");
-          }
-        }
-        if (POSTHOG_AGGREGATED_EVENTS.includes(event.event)) {
-          const eventKey = createTelemetryEventKey(event.event, event.distinctId);
-          await keyStore.setItemWithExpiry(
-            eventKey,
-            TELEMETRY_AGGREGATED_KEY_EXP,
-            JSON.stringify({
-              distinctId: event.distinctId,
-              event: event.event,
-              properties: event.properties,
-              organizationId: event.organizationId
-            })
-          );
-        } else {
-          postHog.capture({
-            event: event.event,
-            distinctId: event.distinctId,
-            properties: event.properties,
-            ...(event.organizationId ? { groups: { organization: event.organizationId } } : {})
-          });
-        }
+        postHog.capture({
+          event: event.event,
+          distinctId: event.distinctId,
+          properties: event.properties
+        });
         return;
       }
 
@@ -149,160 +89,6 @@ To opt into telemetry, you can set "TELEMETRY_ENABLED=true" within the environme
     }
   };
 
-  const aggregateGroupProperties = (events: SingleEventData[]): AggregatedEventData => {
-    const aggregatedData: AggregatedEventData = {};
-
-    // Set the total count
-    aggregatedData.count = events.length;
-
-    events.forEach((event) => {
-      if (!event.properties) return;
-
-      Object.entries(event.properties as Record<string, unknown>).forEach(([key, value]: [string, unknown]) => {
-        if (Array.isArray(value)) {
-          // For arrays, count occurrences of each item
-          const existingCounts =
-            aggregatedData[key] &&
-            typeof aggregatedData[key] === "object" &&
-            aggregatedData[key]?.constructor === Object
-              ? (aggregatedData[key] as Record<string, number>)
-              : {};
-
-          value.forEach((item) => {
-            const itemKey = typeof item === "object" ? JSON.stringify(item) : String(item);
-            existingCounts[itemKey] = (existingCounts[itemKey] || 0) + 1;
-          });
-
-          aggregatedData[key] = existingCounts;
-        } else if (typeof value === "object" && value?.constructor === Object) {
-          // For objects, count occurrences of each field value
-          const existingCounts =
-            aggregatedData[key] &&
-            typeof aggregatedData[key] === "object" &&
-            aggregatedData[key]?.constructor === Object
-              ? (aggregatedData[key] as Record<string, number>)
-              : {};
-
-          if (value) {
-            Object.values(value).forEach((fieldValue) => {
-              const valueKey = typeof fieldValue === "object" ? JSON.stringify(fieldValue) : String(fieldValue);
-              existingCounts[valueKey] = (existingCounts[valueKey] || 0) + 1;
-            });
-          }
-          aggregatedData[key] = existingCounts;
-        } else if (typeof value === "number") {
-          // For numbers, add to existing sum
-          aggregatedData[key] = ((aggregatedData[key] as number) || 0) + value;
-        } else if (value !== undefined && value !== null) {
-          // For other types (strings, booleans, etc.), count occurrences
-          const stringValue = String(value);
-          const existingValue = aggregatedData[key];
-
-          if (!existingValue) {
-            aggregatedData[key] = { [stringValue]: 1 };
-          } else if (existingValue && typeof existingValue === "object" && existingValue.constructor === Object) {
-            const countObject = existingValue as Record<string, number>;
-            countObject[stringValue] = (countObject[stringValue] || 0) + 1;
-          } else {
-            const oldValue = String(existingValue);
-            aggregatedData[key] = {
-              [oldValue]: 1,
-              [stringValue]: 1
-            };
-          }
-        }
-      });
-    });
-
-    return aggregatedData;
-  };
-
-  const processBucketEvents = async (eventType: string, bucketId: string) => {
-    if (!postHog) return 0;
-
-    try {
-      const bucketPattern = `telemetry-event-${eventType}-${bucketId}-*`;
-      const bucketKeys = await keyStore.getKeysByPattern(bucketPattern);
-
-      if (bucketKeys.length === 0) return 0;
-
-      const bucketEvents = await keyStore.getItems(bucketKeys);
-      let bucketEventsParsed: SingleEventData[] = [];
-
-      try {
-        bucketEventsParsed = bucketEvents
-          .filter((event) => event !== null)
-          .map((event) => JSON.parse(event as string) as SingleEventData);
-      } catch (error) {
-        logger.error(error, `Failed to parse bucket events for ${eventType} in ${bucketId}`);
-        return 0;
-      }
-
-      const eventsGrouped = new Map<string, SingleEventData[]>();
-
-      bucketEventsParsed.forEach((event) => {
-        const key = JSON.stringify({ id: event.distinctId, org: event.organizationId });
-        if (!eventsGrouped.has(key)) {
-          eventsGrouped.set(key, []);
-        }
-        eventsGrouped.get(key)!.push(event);
-      });
-
-      if (eventsGrouped.size === 0) return 0;
-
-      for (const [eventsKey, events] of eventsGrouped) {
-        const key = JSON.parse(eventsKey) as { id: string; org?: string };
-        if (key.org) {
-          try {
-            postHog.groupIdentify({ groupType: "organization", groupKey: key.org });
-          } catch (error) {
-            logger.error(error, "Failed to identify PostHog organization");
-          }
-        }
-        const properties = aggregateGroupProperties(events);
-
-        postHog.capture({
-          event: `${eventType} aggregated`,
-          distinctId: key.id,
-          properties,
-          ...(key.org ? { groups: { organization: key.org } } : {})
-        });
-      }
-
-      // Clean up processed data for this bucket
-      await keyStore.deleteItemsByKeyIn(bucketKeys);
-
-      logger.info(`Processed ${bucketEventsParsed.length} events from bucket ${bucketId} for ${eventType}`);
-      return bucketEventsParsed.length;
-    } catch (error) {
-      logger.error(error, `Failed to process bucket ${bucketId} for ${eventType}`);
-      return 0;
-    }
-  };
-
-  const processAggregatedEvents = async () => {
-    if (!postHog) return;
-
-    for (const eventType of POSTHOG_AGGREGATED_EVENTS) {
-      let totalProcessed = 0;
-
-      logger.info(`Starting bucket processing for ${eventType}`);
-
-      // Process each bucket sequentially to control memory usage
-      for (const bucketId of TELEMETRY_BUCKET_NAMES) {
-        try {
-          // eslint-disable-next-line no-await-in-loop
-          const processed = await processBucketEvents(eventType, bucketId);
-          totalProcessed += processed;
-        } catch (error) {
-          logger.error(error, `Failed to process bucket ${bucketId} for ${eventType}`);
-        }
-      }
-
-      logger.info(`Completed processing ${totalProcessed} total events for ${eventType}`);
-    }
-  };
-
   const flushAll = async () => {
     if (postHog) {
       await postHog.shutdownAsync();
@@ -312,8 +98,6 @@ To opt into telemetry, you can set "TELEMETRY_ENABLED=true" within the environme
   return {
     sendLoopsEvent,
     sendPostHogEvents,
-    processAggregatedEvents,
-    flushAll,
-    getBucketForDistinctId
+    flushAll
   };
 };

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

@@ -1,13 +1,3 @@
-import {
-  IdentityActor,
-  KmipClientActor,
-  PlatformActor,
-  ScimClientActor,
-  ServiceActor,
-  UnknownUserActor,
-  UserActor
-} from "@app/ee/services/audit-log/audit-log-types";
-
 export enum PostHogEventTypes {
   SecretPush = "secrets pushed",
   SecretPulled = "secrets pulled",
@@ -50,14 +40,6 @@ export type TSecretModifiedEvent = {
     secretPath: string;
     channel?: string;
     userAgent?: string;
-    actor?:
-      | UserActor
-      | IdentityActor
-      | ServiceActor
-      | ScimClientActor
-      | PlatformActor
-      | UnknownUserActor
-      | KmipClientActor;
   };
 };
 
@@ -232,7 +214,7 @@ export type TInvalidateCacheEvent = {
   };
 };
 
-export type TPostHogEvent = { distinctId: string; organizationId?: string } & (
+export type TPostHogEvent = { distinctId: string } & (
   | TSecretModifiedEvent
   | TAdminInitEvent
   | TUserSignedUpEvent

docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
   nginx:
     container_name: infisical-dev-nginx
     image: nginx
-    restart: "always"
+    restart: always
     ports:
       - 8080:80
       - 8443:443

docs/api-reference/endpoints/tls-cert-auth/attach.mdx

@@ -1,4 +0,0 @@
----
-title: "Attach"
-openapi: "POST /api/v1/auth/tls-cert-auth/identities/{identityId}"
----

docs/api-reference/endpoints/tls-cert-auth/login.mdx

@@ -1,4 +0,0 @@
----
-title: "Login"
-openapi: "POST /api/v1/auth/tls-cert-auth/login"
----

docs/api-reference/endpoints/tls-cert-auth/retrieve.mdx

@@ -1,4 +0,0 @@
----
-title: "Retrieve"
-openapi: "GET /api/v1/auth/tls-cert-auth/identities/{identityId}"
----

docs/api-reference/endpoints/tls-cert-auth/revoke.mdx

@@ -1,4 +0,0 @@
----
-title: "Revoke"
-openapi: "DELETE /api/v1/auth/tls-cert-auth/identities/{identityId}"
----

docs/api-reference/endpoints/tls-cert-auth/update.mdx

@@ -1,4 +0,0 @@
----
-title: "Update"
-openapi: "PATCH /api/v1/auth/tls-cert-auth/identities/{identityId}"
----

docs/docs.json

@@ -288,7 +288,6 @@
                   "documentation/platform/identities/kubernetes-auth",
                   "documentation/platform/identities/oci-auth",
                   "documentation/platform/identities/token-auth",
-                  "documentation/platform/identities/tls-cert-auth",
                   "documentation/platform/identities/universal-auth",
                   {
                     "group": "OIDC Auth",
@@ -753,16 +752,6 @@
                   "api-reference/endpoints/alicloud-auth/revoke"
                 ]
               },
-              {
-                "group": "TLS Certificate Auth",
-                "pages": [
-                  "api-reference/endpoints/tls-cert-auth/login",
-                  "api-reference/endpoints/tls-cert-auth/attach",
-                  "api-reference/endpoints/tls-cert-auth/retrieve",
-                  "api-reference/endpoints/tls-cert-auth/update",
-                  "api-reference/endpoints/tls-cert-auth/revoke"
-                ]
-              },
               {
                 "group": "AWS Auth",
                 "pages": [

docs/documentation/platform/identities/tls-cert-auth.mdx

@@ -1,176 +0,0 @@
----
-title: TLS Certificate Auth
-description: "Learn how to authenticate with Infisical using TLS Certificate."
----
-
-**TLS Certificate Auth** is an authentication method that verifies a user's TLS Client certificate using the provided CA Certificate, allowing secure access to Infisical resources.
-
-## Diagram
-
-The following sequence diagram illustrates the TLS Certificate Auth workflow for authenticating users with Infisical.
-
-```mermaid
-sequenceDiagram
-  participant Client
-  participant Infisical
-
-  Note over Client,Client: Step 1: Setup your TLS request with the client certificate
-
-  Note over Client,Infisical: Step 2: Login Operation
-  Client->>Infisical: Send request to /api/v1/auth/tls-cert-auth/login
-
-  Note over Infisical: Step 3: Request verification using CA Certificate
-
-  Infisical->>Client: Return short-lived access token
-
-  Note over Client,Infisical: Step 5: Access Infisical API with token
-  Client->>Infisical: Make authenticated requests using the short-lived access token
-```
-
-## Concept
-
-At a high level, Infisical authenticates the client's TLS Certificate by verifying its identity and checking that it meets specific requirements (e.g., it is bound to the allowed common names) at the `/api/v1/auth/tls-cert-auth/login` endpoint. If successful, Infisical returns a short-lived access token that can be used to make authenticated requests to the Infisical API.
-
-To be more specific:
-
-1. The client sends a TLS request with the client certificate to Infisical at the `/api/v1/auth/tls-cert-auth/login` endpoint.
-2. Infisical verifies the incoming request using the provided CA certificate.
-3. Infisical checks the user's properties against set criteria such as Allowed Common Names.
-4. If all checks pass, Infisical returns a short-lived access token that the client can use to make authenticated requests to the Infisical API.
-
-<Accordion title="TLS with Load Balancer/Proxy">
-  Most of the time, the Infisical server will be behind a load balancer or
-  proxy. To propagate the TLS certificate from the load balancer to the
-  instance, you can configure the TLS to send the client certificate as a header
-  that is set as an [environment
-  variable](/self-hosting/configuration/envars#param-identity-tls-cert-auth-client-certificate-header-key).
-</Accordion>
-
-## Guide
-
-In the following steps, we explore how to create and use identities for your workloads and applications on TLS Certificate to
-access the Infisical API using request signing.
-
-<Warning>
-  **Self-Hosted Users:** Before using TLS Certificate Auth, please review the
-  [Security Requirements for Self-Hosted
-  Deployments](#security-requirements-for-self-hosted-deployments) section below
-  to ensure proper configuration and avoid security vulnerabilities.
-</Warning>
-
-### Creating an identity
-
-To create an identity, head to your Organization Settings > Access Control > [Identities](https://app.infisical.com/organization/access-management?selectedTab=identities) and press **Create identity**.
-
-![identities organization](/images/platform/identities/identities-org.png)
-
-When creating an identity, you specify an organization-level [role](/documentation/platform/role-based-access-controls) for it to assume; you can configure roles in Organization Settings > Access Control > [Organization Roles](https://app.infisical.com/organization/access-management?selectedTab=roles).
-
-![identities organization create](/images/platform/identities/identities-org-create.png)
-
-Input some details for your new identity:
-
-- **Name (required):** A friendly name for the identity.
-- **Role (required):** A role from the [**Organization Roles**](https://app.infisical.com/organization/access-management?selectedTab=roles) tab for the identity to assume. The organization role assigned will determine what organization-level resources this identity can have access to.
-
-Once you've created an identity, you'll be redirected to a page where you can manage the identity.
-
-![identities page](/images/platform/identities/identities-page.png)
-
-Since the identity has been configured with [Universal Auth](https://infisical.com/docs/documentation/platform/identities/universal-auth) by default, you should reconfigure it to use TLS Certificate Auth instead. To do this, click the cog next to **Universal Auth** and then select **Delete** in the options dropdown.
-
-![identities press cog](/images/platform/identities/identities-press-cog.png)
-
-![identities page remove default auth](/images/platform/identities/identities-page-remove-default-auth.png)
-
-Now create a new TLS Certificate Auth Method.
-
-![identities create tls cert auth method](/images/platform/identities/identities-tls-cert-auth-create-auth.png)
-
-Here's some information about each field:
-
-- **CA Certificate:** A PEM encoded CA Certificate used to validate incoming TLS request client certificate.
-- **Allowed Common Names:** A comma separated list of client certificate common names allowed.
-- **Access Token TTL (default is `2592000` equivalent to 30 days):** The lifetime for an access token in seconds. This value will be referenced at renewal time.
-- **Access Token Max TTL (default is `2592000` equivalent to 30 days):** The maximum lifetime for an access token in seconds. This value will be referenced at renewal time.
-- **Access Token Max Number of Uses (default is `0`):** The maximum number of times that an access token can be used; a value of `0` implies an infinite number of uses.
-- **Access Token Trusted IPs:** The IPs or CIDR ranges that access tokens can be used from. By default, each token is given the `0.0.0.0/0`, allowing usage from any network address.
-
-### Adding an identity to a project
-
-In order to allow an identity to access project-level resources such as secrets, you must add it to the relevant projects.
-
-To do this, head over to the project you want to add the identity to and navigate to Project Settings > Access Control > Machine Identities and press **Add Identity**.
-
-![identities project](/images/platform/identities/identities-project.png)
-
-Select the identity you want to add to the project and the project-level role you want it to assume. The project role given to the identity will determine what project-level resources this identity can access.
-
-![identities project create](/images/platform/identities/identities-project-create.png)
-
-### Accessing the Infisical API with the identity
-
-To access the Infisical API as the identity, you need to send a TLS request to `/api/v1/auth/tls-cert-auth/login` endpoint.
-
-Below is an example of how you can authenticate with Infisical using NodeJS.
-
-```javascript
-const fs = require("fs");
-const https = require("https");
-const axios = require("axios");
-
-try {
-  const clientCertificate = fs.readFileSync("client-cert.pem", "utf8");
-  const clientKeyCertificate = fs.readFileSync("client-key.pem", "utf8");
-
-  const infisicalUrl = "https://app.infisical.com"; // or your self-hosted Infisical URL
-  const identityId = "<your-identity-id>";
-
-  // Create HTTPS agent with client certificate and key
-  const httpsAgent = new https.Agent({
-    cert: clientCertificate,
-    key: clientKeyCertificate,
-  });
-
-  const { data } = await axios.post(
-    `${infisicalUrl}/api/v1/auth/tls-cert-auth/login`,
-    {
-      identityId,
-    },
-    {
-      httpsAgent: httpsAgent, // Pass the HTTPS agent with client cert
-    }
-  );
-
-  console.log("result data: ", data); // access token here
-} catch (err) {
-  console.error(err);
-}
-```
-
-<Note>
-    Each identity access token has a time-to-live (TTL) which you can infer from the response of the login operation; the default TTL is `7200` seconds, which can be adjusted.
-
-    If an identity access token expires, it can no longer access the Infisical API. A new access token should be obtained by performing another login operation.
-
-</Note>
-
-## Security Requirements for Self-Hosted Deployments
-
-ALL TLS cert [login](/api-reference/endpoints/tls-cert-auth/login) requests **MUST** go through a load balancer/proxy that verifies certificate ownership:
-
-- **REQUIRED:** Configure your load balancer/proxy to **require a proper TLS handshake with client certificate presentation**
-- **REQUIRED:** Ensure the load balancer **verifies the client possesses the private key** corresponding to the certificate (standard TLS behavior)
-- **NEVER** allow direct connections to Infisical for TLS cert auth - this enables header injection attacks
-- **NEVER** forward certificate headers without requiring proper TLS certificate presentation
-
-### Load Balancer Configuration Examples
-
-- **AWS ALB:** Use mTLS listeners which require client certificate presentation during the TLS handshake
-- **NGINX/HAProxy:** Configure SSL client certificate requirement with proper TLS handshake verification
-
-<Note>
-  Infisical will handle the actual certificate validation against the configured
-  CA certificate and determine authentication permissions. The load balancer's
-  role is to ensure certificate ownership, not certificate trust validation.
-</Note>

docs/integrations/secret-syncs/gcp-secret-manager.mdx

@@ -7,9 +7,10 @@ description: "Learn how to configure a GCP Secret Manager Sync for Infisical."
 
         - Set up and add secrets to [Infisical Cloud](https://app.infisical.com)
         - Create a [GCP Connection](/integrations/app-connections/gcp) with the required **Secret Sync** permissions
-        - Enable **Cloud Resource Manager API** and **Secret Manager API** on your GCP project
+        - Enable **Cloud Resource Manager API**, **Secret Manager API**, and **Service Usage API** on your GCP project
             ![Secret Syncs Tab](/images/secret-syncs/gcp-secret-manager/enable-resource-manager-api.png)
             ![Secret Syncs Tab](/images/secret-syncs/gcp-secret-manager/enable-secret-manager-api.png)
+            ![Secret Syncs Tab](/images/secret-syncs/gcp-secret-manager/enable-service-usage-api.png)
 
 <Tabs>
     <Tab title="Infisical UI">

docs/self-hosting/configuration/envars.mdx

@@ -32,7 +32,7 @@ Used to configure platform-specific security and operational settings
 <ParamField query="HOST" type="string" default="localhost" optional>
   Specifies the network interface Infisical will bind to when accepting incoming connections.
 
-By default, Infisical binds to `localhost`, which restricts access to connections from the same machine.
+  By default, Infisical binds to `localhost`, which restricts access to connections from the same machine.
 
 To make the application accessible externally (e.g., for self-hosted deployments), set this to `0.0.0.0`, which tells the server to listen on all network interfaces.
 
@@ -122,7 +122,6 @@ DB_READ_REPLICAS=[{"DB_CONNECTION_URI":""}]
 </ParamField>
 
 ### Redis
-
 Redis is used for caching and background tasks. You can use either a standalone Redis instance or a Redis Sentinel setup.
 
 <Tabs>
@@ -200,17 +199,8 @@ Without email configuration, Infisical's core functions like sign-up/login and s
   connection can not be encrypted then message is not sent.
 </ParamField>
 
-<ParamField
-  query="SMTP_TLS_REJECT_UNAUTHORIZED"
-  type="bool"
-  default="true"
-  optional
->
-  If this is `true`, Infisical will validate the server's SSL/TLS certificate
-  and reject the connection if the certificate is invalid or not trusted. If set
-  to `false`, the client will accept the server's certificate regardless of its
-  validity, which can be useful in development or testing environments but is
-  not recommended for production use.
+<ParamField query="SMTP_TLS_REJECT_UNAUTHORIZED" type="bool" default="true" optional>
+  If this is `true`, Infisical will validate the server's SSL/TLS certificate and reject the connection if the certificate is invalid or not trusted. If set to `false`, the client will accept the server's certificate regardless of its validity, which can be useful in development or testing environments but is not recommended for production use.
 </ParamField>
 
 <ParamField query="SMTP_CUSTOM_CA_CERT" type="string" default="none" optional>
@@ -221,7 +211,6 @@ Without email configuration, Infisical's core functions like sign-up/login and s
     Infisical highly encourages the following variables be used alongside this one for maximum security:
     - `SMTP_REQUIRE_TLS=true`
     - `SMTP_TLS_REJECT_UNAUTHORIZED=true`
-
 </ParamField>
 </Accordion>
 
@@ -588,7 +577,6 @@ You can configure third-party app connections for re-use across Infisical Projec
     <ParamField query="INF_APP_CONNECTION_GITHUB_RADAR_APP_WEBHOOK_SECRET" type="string" default="none" optional>
         The webhook secret configured for payload verification in the GitHub Radar App
     </ParamField>
-
 </Accordion>
 
 <Accordion title="GitHub OAuth Connection">
@@ -783,14 +771,3 @@ If export type is set to `otlp`, you will have to configure a value for `OTEL_EX
 <ParamField query="OTEL_COLLECTOR_BASIC_AUTH_PASSWORD" type="string">
   The password for authenticating with the telemetry collector.
 </ParamField>
-
-## Identity Auth Method
-
-<ParamField
-  query="IDENTITY_TLS_CERT_AUTH_CLIENT_CERTIFICATE_HEADER_KEY"
-  type="string"
-  default="x-identity-tls-cert-auth-client-cert"
->
-  The TLS header used to propagate the client certificate from the load balancer
-  to the server.
-</ParamField>

frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/GcpSyncFields.tsx

@@ -76,7 +76,7 @@ export const GcpSyncFields = () => {
             helperText={
               <Tooltip
                 className="max-w-md"
-                content="Ensure that you've enabled the Secret Manager API and Cloud Resource Manager API on your GCP project. Additionally, make sure that the service account is assigned the appropriate GCP roles."
+                content="Ensure that you've enabled the Secret Manager API, Cloud Resource Manager API, and Service Usage API on your GCP project. Additionally, make sure that the service account is assigned the appropriate GCP roles."
               >
                 <div>
                   <span>Don&#39;t see the project you&#39;re looking for?</span>{" "}

frontend/src/components/v2/Pagination/Pagination.tsx

@@ -64,7 +64,7 @@ export const Pagination = ({
               <FontAwesomeIcon className="text-xs" icon={faCaretDown} />
             </IconButton>
           </DropdownMenuTrigger>
-          <DropdownMenuContent sideOffset={2} className="min-w-fit">
+          <DropdownMenuContent className="min-w-fit">
             {perPageList.map((perPageOption) => (
               <DropdownMenuItem
                 key={`pagination-per-page-options-${perPageOption}`}

frontend/src/hooks/api/identities/constants.tsx

@@ -11,6 +11,5 @@ export const identityAuthToNameMap: { [I in IdentityAuthMethod]: string } = {
   [IdentityAuthMethod.OCI_AUTH]: "OCI Auth",
   [IdentityAuthMethod.OIDC_AUTH]: "OIDC Auth",
   [IdentityAuthMethod.LDAP_AUTH]: "LDAP Auth",
-  [IdentityAuthMethod.JWT_AUTH]: "JWT Auth",
-  [IdentityAuthMethod.TLS_CERT_AUTH]: "TLS Certificate Auth"
+  [IdentityAuthMethod.JWT_AUTH]: "JWT Auth"
 };

frontend/src/hooks/api/identities/enums.tsx

@@ -9,8 +9,7 @@ export enum IdentityAuthMethod {
   OCI_AUTH = "oci-auth",
   OIDC_AUTH = "oidc-auth",
   LDAP_AUTH = "ldap-auth",
-  JWT_AUTH = "jwt-auth",
-  TLS_CERT_AUTH = "tls-cert-auth"
+  JWT_AUTH = "jwt-auth"
 }
 
 export enum IdentityJwtConfigurationType {

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

@@ -14,7 +14,6 @@ import {
   AddIdentityLdapAuthDTO,
   AddIdentityOciAuthDTO,
   AddIdentityOidcAuthDTO,
-  AddIdentityTlsCertAuthDTO,
   AddIdentityTokenAuthDTO,
   AddIdentityUniversalAuthDTO,
   ClientSecretData,
@@ -33,7 +32,6 @@ import {
   DeleteIdentityLdapAuthDTO,
   DeleteIdentityOciAuthDTO,
   DeleteIdentityOidcAuthDTO,
-  DeleteIdentityTlsCertAuthDTO,
   DeleteIdentityTokenAuthDTO,
   DeleteIdentityUniversalAuthClientSecretDTO,
   DeleteIdentityUniversalAuthDTO,
@@ -48,7 +46,6 @@ import {
   IdentityLdapAuth,
   IdentityOciAuth,
   IdentityOidcAuth,
-  IdentityTlsCertAuth,
   IdentityTokenAuth,
   IdentityUniversalAuth,
   RevokeTokenDTO,
@@ -63,7 +60,6 @@ import {
   UpdateIdentityLdapAuthDTO,
   UpdateIdentityOciAuthDTO,
   UpdateIdentityOidcAuthDTO,
-  UpdateIdentityTlsCertAuthDTO,
   UpdateIdentityTokenAuthDTO,
   UpdateIdentityUniversalAuthDTO,
   UpdateTokenIdentityTokenAuthDTO
@@ -659,107 +655,6 @@ export const useDeleteIdentityAliCloudAuth = () => {
   });
 };
 
-export const useAddIdentityTlsCertAuth = () => {
-  const queryClient = useQueryClient();
-  return useMutation<IdentityTlsCertAuth, object, AddIdentityTlsCertAuthDTO>({
-    mutationFn: async ({
-      identityId,
-      allowedCommonNames,
-      caCertificate,
-      accessTokenTTL,
-      accessTokenMaxTTL,
-      accessTokenNumUsesLimit,
-      accessTokenTrustedIps
-    }) => {
-      const {
-        data: { identityTlsCertAuth }
-      } = await apiRequest.post<{ identityTlsCertAuth: IdentityTlsCertAuth }>(
-        `/api/v1/auth/tls-cert-auth/identities/${identityId}`,
-        {
-          allowedCommonNames,
-          caCertificate,
-          accessTokenTTL,
-          accessTokenMaxTTL,
-          accessTokenNumUsesLimit,
-          accessTokenTrustedIps
-        }
-      );
-
-      return identityTlsCertAuth;
-    },
-    onSuccess: (_, { identityId, organizationId }) => {
-      queryClient.invalidateQueries({
-        queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
-      });
-      queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
-      queryClient.invalidateQueries({
-        queryKey: identitiesKeys.getIdentityTlsCertAuth(identityId)
-      });
-    }
-  });
-};
-
-export const useUpdateIdentityTlsCertAuth = () => {
-  const queryClient = useQueryClient();
-  return useMutation<IdentityTlsCertAuth, object, UpdateIdentityTlsCertAuthDTO>({
-    mutationFn: async ({
-      identityId,
-      allowedCommonNames,
-      caCertificate,
-      accessTokenTTL,
-      accessTokenMaxTTL,
-      accessTokenNumUsesLimit,
-      accessTokenTrustedIps
-    }) => {
-      const {
-        data: { identityTlsCertAuth }
-      } = await apiRequest.patch<{ identityTlsCertAuth: IdentityTlsCertAuth }>(
-        `/api/v1/auth/tls-cert-auth/identities/${identityId}`,
-        {
-          caCertificate,
-          allowedCommonNames,
-          accessTokenTTL,
-          accessTokenMaxTTL,
-          accessTokenNumUsesLimit,
-          accessTokenTrustedIps
-        }
-      );
-
-      return identityTlsCertAuth;
-    },
-    onSuccess: (_, { identityId, organizationId }) => {
-      queryClient.invalidateQueries({
-        queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
-      });
-      queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
-      queryClient.invalidateQueries({
-        queryKey: identitiesKeys.getIdentityTlsCertAuth(identityId)
-      });
-    }
-  });
-};
-
-export const useDeleteIdentityTlsCertAuth = () => {
-  const queryClient = useQueryClient();
-  return useMutation<IdentityTlsCertAuth, object, DeleteIdentityTlsCertAuthDTO>({
-    mutationFn: async ({ identityId }) => {
-      const {
-        data: { identityTlsCertAuth }
-      } = await apiRequest.delete(`/api/v1/auth/tls-cert-auth/identities/${identityId}`);
-      return identityTlsCertAuth;
-    },
-    onSuccess: (_, { organizationId, identityId }) => {
-      queryClient.invalidateQueries({
-        queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
-      });
-      queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
-      queryClient.invalidateQueries({
-        queryKey: identitiesKeys.getIdentityTlsCertAuth(identityId)
-      });
-    }
-  });
-};
-
 export const useUpdateIdentityOidcAuth = () => {
   const queryClient = useQueryClient();
   return useMutation<IdentityOidcAuth, object, UpdateIdentityOidcAuthDTO>({

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

@@ -17,7 +17,6 @@ import {
   IdentityMembershipOrg,
   IdentityOciAuth,
   IdentityOidcAuth,
-  IdentityTlsCertAuth,
   IdentityTokenAuth,
   IdentityUniversalAuth,
   TSearchIdentitiesDTO
@@ -35,8 +34,6 @@ export const identitiesKeys = {
   getIdentityGcpAuth: (identityId: string) => [{ identityId }, "identity-gcp-auth"] as const,
   getIdentityOidcAuth: (identityId: string) => [{ identityId }, "identity-oidc-auth"] as const,
   getIdentityAwsAuth: (identityId: string) => [{ identityId }, "identity-aws-auth"] as const,
-  getIdentityTlsCertAuth: (identityId: string) =>
-    [{ identityId }, "identity-tls-cert-auth"] as const,
   getIdentityAliCloudAuth: (identityId: string) =>
     [{ identityId }, "identity-alicloud-auth"] as const,
   getIdentityOciAuth: (identityId: string) => [{ identityId }, "identity-oci-auth"] as const,
@@ -81,8 +78,7 @@ export const useSearchIdentities = (dto: TSearchIdentitiesDTO) => {
         search
       });
       return data;
-    },
-    placeholderData: (previousData) => previousData
+    }
   });
 };
 
@@ -179,27 +175,6 @@ export const useGetIdentityAwsAuth = (
   });
 };
 
-export const useGetIdentityTlsCertAuth = (
-  identityId: string,
-  options?: TReactQueryOptions["options"]
-) => {
-  return useQuery({
-    queryKey: identitiesKeys.getIdentityTlsCertAuth(identityId),
-    queryFn: async () => {
-      const {
-        data: { identityTlsCertAuth }
-      } = await apiRequest.get<{ identityTlsCertAuth: IdentityTlsCertAuth }>(
-        `/api/v1/auth/tls-cert-auth/identities/${identityId}`
-      );
-      return identityTlsCertAuth;
-    },
-    staleTime: 0,
-    gcTime: 0,
-    ...options,
-    enabled: Boolean(identityId) && (options?.enabled ?? true)
-  });
-};
-
 export const useGetIdentityOciAuth = (
   identityId: string,
   options?: TReactQueryOptions["options"]

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

@@ -485,47 +485,6 @@ export type DeleteIdentityKubernetesAuthDTO = {
   identityId: string;
 };
 
-export type IdentityTlsCertAuth = {
-  identityId: string;
-  caCertificate: string;
-  allowedCommonNames: string;
-  accessTokenTTL: number;
-  accessTokenMaxTTL: number;
-  accessTokenNumUsesLimit: number;
-  accessTokenTrustedIps: IdentityTrustedIp[];
-};
-
-export type AddIdentityTlsCertAuthDTO = {
-  organizationId: string;
-  identityId: string;
-  caCertificate: string;
-  allowedCommonNames?: string;
-  accessTokenTTL: number;
-  accessTokenMaxTTL: number;
-  accessTokenNumUsesLimit: number;
-  accessTokenTrustedIps: {
-    ipAddress: string;
-  }[];
-};
-
-export type UpdateIdentityTlsCertAuthDTO = {
-  organizationId: string;
-  identityId: string;
-  caCertificate: string;
-  allowedCommonNames?: string | null;
-  accessTokenTTL?: number;
-  accessTokenMaxTTL?: number;
-  accessTokenNumUsesLimit?: number;
-  accessTokenTrustedIps?: {
-    ipAddress: string;
-  }[];
-};
-
-export type DeleteIdentityTlsCertAuthDTO = {
-  organizationId: string;
-  identityId: string;
-};
-
 export type CreateIdentityUniversalAuthClientSecretDTO = {
   identityId: string;
   description?: string;

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

@@ -154,6 +154,6 @@ export type TOrgIdentitiesList = {
 };
 
 export enum OrgIdentityOrderBy {
-  Name = "name",
-  Role = "role"
+  Name = "name"
+  // Role = "role"
 }

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx

@@ -56,12 +56,12 @@ export const OrgGroupsSection = () => {
 
   return (
     <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-      <div className="mb-4 flex items-center justify-between">
+      <div className="mb-4 flex justify-between">
         <p className="text-xl font-semibold text-mineshaft-100">Groups</p>
         <OrgPermissionCan I={OrgPermissionGroupActions.Create} a={OrgPermissionSubjects.Groups}>
           {(isAllowed) => (
             <Button
-              colorSchema="secondary"
+              colorSchema="primary"
               type="submit"
               leftIcon={<FontAwesomeIcon icon={faPlus} />}
               onClick={() => handleAddGroupModal()}

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx

@@ -2,17 +2,14 @@ import { useMemo } from "react";
 import {
   faArrowDown,
   faArrowUp,
-  faCopy,
-  faEdit,
-  faEllipsisV,
+  faEllipsis,
   faMagnifyingGlass,
   faSearch,
-  faTrash,
-  faUserGroup,
   faUsers
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
+import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
 import { OrgPermissionCan } from "@app/components/permissions";
@@ -264,8 +261,7 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                               <Select
                                 value={role === "custom" ? (customRole?.slug as string) : role}
                                 isDisabled={!isAllowed}
-                                className="h-8 w-48 bg-mineshaft-700"
-                                position="popper"
+                                className="w-48 bg-mineshaft-600"
                                 dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
                                 onValueChange={(selectedRole) =>
                                   handleChangeRole({
@@ -286,19 +282,13 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                       </Td>
                       <Td>
                         <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <IconButton
-                              ariaLabel="Options"
-                              className="w-6"
-                              colorSchema="secondary"
-                              variant="plain"
-                            >
-                              <FontAwesomeIcon icon={faEllipsisV} />
-                            </IconButton>
+                          <DropdownMenuTrigger asChild className="rounded-lg">
+                            <div className="hover:text-primary-400 data-[state=open]:text-primary-400">
+                              <FontAwesomeIcon size="sm" icon={faEllipsis} />
+                            </div>
                           </DropdownMenuTrigger>
-                          <DropdownMenuContent sideOffset={2} align="end">
+                          <DropdownMenuContent align="start" className="p-1">
                             <DropdownMenuItem
-                              icon={<FontAwesomeIcon icon={faCopy} />}
                               onClick={(e) => {
                                 e.stopPropagation();
                                 createNotification({
@@ -316,7 +306,10 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                             >
                               {(isAllowed) => (
                                 <DropdownMenuItem
-                                  icon={<FontAwesomeIcon icon={faEdit} />}
+                                  className={twMerge(
+                                    !isAllowed &&
+                                      "pointer-events-none cursor-not-allowed opacity-50"
+                                  )}
                                   onClick={(e) => {
                                     e.stopPropagation();
                                     handlePopUpOpen("group", {
@@ -327,7 +320,7 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                                       customRole
                                     });
                                   }}
-                                  isDisabled={!isAllowed}
+                                  disabled={!isAllowed}
                                 >
                                   Edit Group
                                 </DropdownMenuItem>
@@ -339,7 +332,10 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                             >
                               {(isAllowed) => (
                                 <DropdownMenuItem
-                                  icon={<FontAwesomeIcon icon={faUserGroup} />}
+                                  className={twMerge(
+                                    !isAllowed &&
+                                      "pointer-events-none cursor-not-allowed opacity-50"
+                                  )}
                                   onClick={() =>
                                     navigate({
                                       to: "/organization/groups/$groupId",
@@ -348,7 +344,7 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                                       }
                                     })
                                   }
-                                  isDisabled={!isAllowed}
+                                  disabled={!isAllowed}
                                 >
                                   Manage Members
                                 </DropdownMenuItem>
@@ -360,7 +356,11 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                             >
                               {(isAllowed) => (
                                 <DropdownMenuItem
-                                  icon={<FontAwesomeIcon icon={faTrash} />}
+                                  className={twMerge(
+                                    isAllowed
+                                      ? "hover:!bg-red-500 hover:!text-white"
+                                      : "pointer-events-none cursor-not-allowed opacity-50"
+                                  )}
                                   onClick={(e) => {
                                     e.stopPropagation();
                                     handlePopUpOpen("deleteGroup", {
@@ -368,7 +368,7 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                                       name
                                     });
                                   }}
-                                  isDisabled={!isAllowed}
+                                  disabled={!isAllowed}
                                 >
                                   Delete Group
                                 </DropdownMenuItem>

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx

@@ -17,7 +17,6 @@ import { IdentityKubernetesAuthForm } from "./IdentityKubernetesAuthForm";
 import { IdentityLdapAuthForm } from "./IdentityLdapAuthForm";
 import { IdentityOciAuthForm } from "./IdentityOciAuthForm";
 import { IdentityOidcAuthForm } from "./IdentityOidcAuthForm";
-import { IdentityTlsCertAuthForm } from "./IdentityTlsCertAuthForm";
 import { IdentityTokenAuthForm } from "./IdentityTokenAuthForm";
 import { IdentityUniversalAuthForm } from "./IdentityUniversalAuthForm";
 
@@ -53,7 +52,6 @@ const identityAuthMethods = [
   { label: "OCI Auth", value: IdentityAuthMethod.OCI_AUTH },
   { label: "OIDC Auth", value: IdentityAuthMethod.OIDC_AUTH },
   { label: "LDAP Auth", value: IdentityAuthMethod.LDAP_AUTH },
-  { label: "TLS Certificate Auth", value: IdentityAuthMethod.TLS_CERT_AUTH },
   {
     label: "JWT Auth",
     value: IdentityAuthMethod.JWT_AUTH
@@ -125,15 +123,6 @@ export const IdentityAuthMethodModalContent = ({
         />
       )
     },
-    [IdentityAuthMethod.TLS_CERT_AUTH]: {
-      render: () => (
-        <IdentityTlsCertAuthForm
-          identityId={identityAuthMethodData.identityId}
-          handlePopUpOpen={handlePopUpOpen}
-          handlePopUpToggle={handlePopUpToggle}
-        />
-      )
-    },
 
     [IdentityAuthMethod.OIDC_AUTH]: {
       render: () => (

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -1,4 +1,4 @@
-import { faArrowUpRightFromSquare, faBookOpen, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faArrowUpRightFromSquare, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
@@ -71,22 +71,20 @@ export const IdentitySection = withPermission(
 
     return (
       <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-        <div className="mb-4 flex items-center justify-between">
-          <div className="flex items-center gap-1">
-            <p className="text-xl font-semibold text-mineshaft-100">Identities</p>
+        <div className="mb-4 flex justify-between">
+          <p className="text-xl font-semibold text-mineshaft-100">Identities</p>
+          <div className="flex w-full justify-end pr-4">
             <a
-              href="https://infisical.com/docs/documentation/platform/identities/overview"
               target="_blank"
               rel="noopener noreferrer"
+              href="https://infisical.com/docs/documentation/platform/identities/overview"
+              className="flex w-max cursor-pointer items-center rounded-md border border-mineshaft-500 bg-mineshaft-600 px-4 py-2 text-mineshaft-200 duration-200 hover:border-primary/40 hover:bg-primary/10 hover:text-white"
             >
-              <div className="ml-1 mt-[0.16rem] inline-block rounded-md bg-yellow/20 px-1.5 text-sm text-yellow opacity-80 hover:opacity-100">
-                <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
-                <span>Docs</span>
-                <FontAwesomeIcon
-                  icon={faArrowUpRightFromSquare}
-                  className="mb-[0.07rem] ml-1.5 text-[10px]"
-                />
-              </div>
+              Documentation{" "}
+              <FontAwesomeIcon
+                icon={faArrowUpRightFromSquare}
+                className="mb-[0.06rem] ml-1 text-xs"
+              />
             </a>
           </div>
           <OrgPermissionCan
@@ -95,7 +93,7 @@ export const IdentitySection = withPermission(
           >
             {(isAllowed) => (
               <Button
-                colorSchema="secondary"
+                colorSchema="primary"
                 type="submit"
                 leftIcon={<FontAwesomeIcon icon={faPlus} />}
                 onClick={() => {

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx

@@ -1,15 +1,12 @@
-import { useCallback, useState } from "react";
+import { useState } from "react";
+import { Controller, useForm } from "react-hook-form";
 import {
   faArrowDown,
   faArrowUp,
-  faCheckCircle,
-  faChevronRight,
-  faEdit,
-  faEllipsisV,
+  faEllipsis,
   faFilter,
   faMagnifyingGlass,
-  faServer,
-  faTrash
+  faServer
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
@@ -18,18 +15,19 @@ import { twMerge } from "tailwind-merge";
 import { createNotification } from "@app/components/notifications";
 import { OrgPermissionCan } from "@app/components/permissions";
 import {
+  Button,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuLabel,
   DropdownMenuTrigger,
-  DropdownSubMenu,
-  DropdownSubMenuContent,
-  DropdownSubMenuTrigger,
   EmptyState,
+  FormControl,
   IconButton,
   Input,
   Pagination,
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
   Select,
   SelectItem,
   Spinner,
@@ -40,6 +38,7 @@ import {
   Td,
   Th,
   THead,
+  Tooltip,
   Tr
 } from "@app/components/v2";
 import { OrgPermissionIdentityActions, OrgPermissionSubjects, useOrganization } from "@app/context";
@@ -64,10 +63,6 @@ type Props = {
   ) => void;
 };
 
-type Filter = {
-  roles: string[];
-};
-
 export const IdentityTable = ({ handlePopUpOpen }: Props) => {
   const navigate = useNavigate();
   const { currentOrg } = useOrganization();
@@ -95,9 +90,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
     setUserTablePreference("identityTable", PreferenceKey.PerPage, newPerPage);
   };
 
-  const [filter, setFilter] = useState<Filter>({
-    roles: []
-  });
+  const [filteredRoles, setFilteredRoles] = useState<string[]>([]);
 
   const organizationId = currentOrg?.id || "";
 
@@ -110,7 +103,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
     orderBy,
     search: {
       name: debouncedSearch ? { $contains: debouncedSearch } : undefined,
-      role: filter.roles?.length ? { $in: filter.roles } : undefined
+      role: filteredRoles?.length ? { $in: filteredRoles } : undefined
     }
   });
 
@@ -120,6 +113,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
     offset,
     setPage
   });
+  const filterForm = useForm<{ roles: string }>();
 
   const { data: roles } = useGetOrgRoles(organizationId);
 
@@ -159,80 +153,79 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
     }
   };
 
-  const handleRoleToggle = useCallback(
-    (roleSlug: string) =>
-      setFilter((state) => {
-        const currentRoles = state.roles || [];
-
-        if (currentRoles.includes(roleSlug)) {
-          return { ...state, roles: currentRoles.filter((role) => role !== roleSlug) };
-        }
-        return { ...state, roles: [...currentRoles, roleSlug] };
-      }),
-    []
-  );
-
-  const isTableFiltered = Boolean(filter.roles.length);
-
   return (
     <div>
       <div className="mb-4 flex items-center space-x-2">
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <IconButton
-              ariaLabel="Filter Identities"
-              variant="plain"
-              size="sm"
-              className={twMerge(
-                "flex h-[2.375rem] w-[2.6rem] items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
-                isTableFiltered && "border-primary/50 text-primary"
-              )}
-            >
-              <FontAwesomeIcon icon={faFilter} />
-            </IconButton>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="start" className="p-0">
-            <DropdownMenuLabel>Filter By</DropdownMenuLabel>
-            <DropdownSubMenu>
-              <DropdownSubMenuTrigger
-                iconPos="right"
-                icon={<FontAwesomeIcon icon={faChevronRight} size="sm" />}
-              >
-                Roles
-              </DropdownSubMenuTrigger>
-              <DropdownSubMenuContent className="thin-scrollbar max-h-[20rem] overflow-y-auto rounded-l-none">
-                <DropdownMenuLabel className="sticky top-0 bg-mineshaft-900">
-                  Apply Roles to Filter Identities
-                </DropdownMenuLabel>
-                {roles?.map(({ id, slug, name }) => (
-                  <DropdownMenuItem
-                    onClick={(evt) => {
-                      evt.preventDefault();
-                      handleRoleToggle(slug);
-                    }}
-                    key={id}
-                    icon={filter.roles.includes(slug) && <FontAwesomeIcon icon={faCheckCircle} />}
-                    iconPos="right"
-                  >
-                    <div className="flex items-center">
-                      <div
-                        className="mr-2 h-2 w-2 rounded-full"
-                        style={{ background: "#bec2c8" }}
-                      />
-                      {name}
-                    </div>
-                  </DropdownMenuItem>
-                ))}
-              </DropdownSubMenuContent>
-            </DropdownSubMenu>
-          </DropdownMenuContent>
-        </DropdownMenu>
         <Input
           value={search}
           onChange={(e) => setSearch(e.target.value)}
           leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
           placeholder="Search identities by name..."
         />
+        <div>
+          <Popover>
+            <PopoverTrigger>
+              <IconButton
+                ariaLabel="filter"
+                variant="outline_bg"
+                className={filteredRoles?.length ? "border-primary" : ""}
+              >
+                <Tooltip content="Advance Filter">
+                  <FontAwesomeIcon icon={faFilter} />
+                </Tooltip>
+              </IconButton>
+            </PopoverTrigger>
+            <PopoverContent className="w-auto border border-mineshaft-600 bg-mineshaft-800 p-2 drop-shadow-2xl">
+              <div className="mb-4 border-b border-b-gray-700 pb-2 text-sm text-mineshaft-300">
+                Advance Filter
+              </div>
+              <form
+                onSubmit={filterForm.handleSubmit((el) => {
+                  setFilteredRoles(el.roles?.split(",")?.filter(Boolean) || []);
+                })}
+              >
+                <Controller
+                  control={filterForm.control}
+                  name="roles"
+                  render={({ field, fieldState: { error } }) => (
+                    <FormControl
+                      label="Roles"
+                      helperText="Eg: admin,viewer"
+                      isError={Boolean(error?.message)}
+                      errorText={error?.message}
+                    >
+                      <Input {...field} />
+                    </FormControl>
+                  )}
+                />
+                <div className="flex items-center space-x-2">
+                  <Button
+                    type="submit"
+                    size="xs"
+                    colorSchema="primary"
+                    variant="outline_bg"
+                    className="mt-4"
+                  >
+                    Apply Filter
+                  </Button>
+                  {Boolean(filteredRoles.length) && (
+                    <Button
+                      size="xs"
+                      variant="link"
+                      className="ml-4 mt-4"
+                      onClick={() => {
+                        filterForm.reset({ roles: "" });
+                        setFilteredRoles([]);
+                      }}
+                    >
+                      Clear
+                    </Button>
+                  )}
+                </div>
+              </form>
+            </PopoverContent>
+          </Popover>
+        </div>
       </div>
       <TableContainer>
         <Table>
@@ -258,7 +251,8 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                   </IconButton>
                 </div>
               </Th>
-              <Th>
+              <Th>Role</Th>
+              {/* <Th>
                 <div className="flex items-center">
                   Role
                   <IconButton
@@ -277,7 +271,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                     />
                   </IconButton>
                 </div>
-              </Th>
+              </Th> */}
               <Th className="w-16">{isFetching ? <Spinner size="xs" /> : null}</Th>
             </Tr>
           </THead>
@@ -309,8 +303,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                             <Select
                               value={role === "custom" ? (customRole?.slug as string) : role}
                               isDisabled={!isAllowed}
-                              className="h-8 w-48 bg-mineshaft-700"
-                              position="popper"
+                              className="w-48 bg-mineshaft-600"
                               dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
                               onValueChange={(selectedRole) =>
                                 handleChangeRole({
@@ -331,24 +324,21 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                     </Td>
                     <Td>
                       <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                          <IconButton
-                            ariaLabel="Options"
-                            className="w-6"
-                            colorSchema="secondary"
-                            variant="plain"
-                          >
-                            <FontAwesomeIcon icon={faEllipsisV} />
-                          </IconButton>
+                        <DropdownMenuTrigger asChild className="rounded-lg">
+                          <div className="flex justify-center hover:text-primary-400 data-[state=open]:text-primary-400">
+                            <FontAwesomeIcon size="sm" icon={faEllipsis} />
+                          </div>
                         </DropdownMenuTrigger>
-                        <DropdownMenuContent sideOffset={2} align="end">
+                        <DropdownMenuContent align="start" className="mt-3 p-1">
                           <OrgPermissionCan
                             I={OrgPermissionIdentityActions.Edit}
                             a={OrgPermissionSubjects.Identity}
                           >
                             {(isAllowed) => (
                               <DropdownMenuItem
-                                icon={<FontAwesomeIcon icon={faEdit} />}
+                                className={twMerge(
+                                  !isAllowed && "pointer-events-none cursor-not-allowed opacity-50"
+                                )}
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   navigate({
@@ -358,7 +348,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                                     }
                                   });
                                 }}
-                                isDisabled={!isAllowed}
+                                disabled={!isAllowed}
                               >
                                 Edit Identity
                               </DropdownMenuItem>
@@ -370,6 +360,11 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                           >
                             {(isAllowed) => (
                               <DropdownMenuItem
+                                className={twMerge(
+                                  isAllowed
+                                    ? "hover:!bg-red-500 hover:!text-white"
+                                    : "pointer-events-none cursor-not-allowed opacity-50"
+                                )}
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   handlePopUpOpen("deleteIdentity", {
@@ -377,8 +372,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                                     name
                                   });
                                 }}
-                                isDisabled={!isAllowed}
-                                icon={<FontAwesomeIcon icon={faTrash} />}
+                                disabled={!isAllowed}
                               >
                                 Delete Identity
                               </DropdownMenuItem>
@@ -404,7 +398,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
         {!isPending && data && data?.identities.length === 0 && (
           <EmptyState
             title={
-              debouncedSearch.trim().length > 0 || filter.roles?.length > 0
+              debouncedSearch.trim().length > 0 || filteredRoles?.length > 0
                 ? "No identities match search filter"
                 : "No identities have been created in this organization"
             }

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTlsCertAuthForm.tsx

@@ -1,358 +0,0 @@
-import { useEffect, useState } from "react";
-import { Controller, useFieldArray, useForm } from "react-hook-form";
-import { faPlus, faXmark } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-
-import { createNotification } from "@app/components/notifications";
-import {
-  Button,
-  FormControl,
-  IconButton,
-  Input,
-  Tab,
-  TabList,
-  TabPanel,
-  Tabs,
-  TextArea
-} from "@app/components/v2";
-import { useOrganization, useSubscription } from "@app/context";
-import {
-  useAddIdentityTlsCertAuth,
-  useGetIdentityTlsCertAuth,
-  useUpdateIdentityTlsCertAuth
-} from "@app/hooks/api";
-import { IdentityTrustedIp } from "@app/hooks/api/identities/types";
-import { UsePopUpState } from "@app/hooks/usePopUp";
-
-import { IdentityFormTab } from "./types";
-
-const schema = z.object({
-  allowedCommonNames: z.string().optional(),
-  caCertificate: z.string().min(1),
-  accessTokenTTL: z.string().refine((val) => Number(val) <= 315360000, {
-    message: "Access Token TTL cannot be greater than 315360000"
-  }),
-  accessTokenMaxTTL: z.string().refine((val) => Number(val) <= 315360000, {
-    message: "Access Token Max TTL cannot be greater than 315360000"
-  }),
-  accessTokenNumUsesLimit: z.string(),
-  accessTokenTrustedIps: z
-    .array(
-      z.object({
-        ipAddress: z.string().max(50)
-      })
-    )
-    .min(1)
-});
-
-export type FormData = z.infer<typeof schema>;
-
-type Props = {
-  handlePopUpOpen: (popUpName: keyof UsePopUpState<["upgradePlan"]>) => void;
-  handlePopUpToggle: (
-    popUpName: keyof UsePopUpState<["identityAuthMethod"]>,
-    state?: boolean
-  ) => void;
-  identityId?: string;
-  isUpdate?: boolean;
-};
-
-export const IdentityTlsCertAuthForm = ({
-  handlePopUpOpen,
-  handlePopUpToggle,
-  identityId,
-  isUpdate
-}: Props) => {
-  const { currentOrg } = useOrganization();
-  const orgId = currentOrg?.id || "";
-  const { subscription } = useSubscription();
-
-  const { mutateAsync: addMutateAsync } = useAddIdentityTlsCertAuth();
-  const { mutateAsync: updateMutateAsync } = useUpdateIdentityTlsCertAuth();
-  const [tabValue, setTabValue] = useState<IdentityFormTab>(IdentityFormTab.Configuration);
-
-  const { data } = useGetIdentityTlsCertAuth(identityId ?? "", {
-    enabled: isUpdate
-  });
-
-  const {
-    control,
-    handleSubmit,
-    reset,
-    formState: { isSubmitting }
-  } = useForm<FormData>({
-    resolver: zodResolver(schema),
-    defaultValues: {
-      caCertificate: "",
-      accessTokenTTL: "2592000",
-      accessTokenMaxTTL: "2592000",
-      accessTokenNumUsesLimit: "0",
-      accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }]
-    }
-  });
-
-  const {
-    fields: accessTokenTrustedIpsFields,
-    append: appendAccessTokenTrustedIp,
-    remove: removeAccessTokenTrustedIp
-  } = useFieldArray({ control, name: "accessTokenTrustedIps" });
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        caCertificate: data.caCertificate,
-        allowedCommonNames: data.allowedCommonNames || undefined,
-        accessTokenTTL: String(data.accessTokenTTL),
-        accessTokenMaxTTL: String(data.accessTokenMaxTTL),
-        accessTokenNumUsesLimit: String(data.accessTokenNumUsesLimit),
-        accessTokenTrustedIps: data.accessTokenTrustedIps.map(
-          ({ ipAddress, prefix }: IdentityTrustedIp) => {
-            return {
-              ipAddress: `${ipAddress}${prefix !== undefined ? `/${prefix}` : ""}`
-            };
-          }
-        )
-      });
-    } else {
-      reset({
-        caCertificate: "",
-        accessTokenTTL: "2592000",
-        accessTokenMaxTTL: "2592000",
-        accessTokenNumUsesLimit: "0",
-        accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }]
-      });
-    }
-  }, [data]);
-
-  const onFormSubmit = async ({
-    caCertificate,
-    allowedCommonNames,
-    accessTokenTTL,
-    accessTokenMaxTTL,
-    accessTokenNumUsesLimit,
-    accessTokenTrustedIps
-  }: FormData) => {
-    try {
-      if (!identityId) return;
-
-      if (data) {
-        await updateMutateAsync({
-          organizationId: orgId,
-          caCertificate,
-          allowedCommonNames: allowedCommonNames || null,
-          identityId,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      } else {
-        await addMutateAsync({
-          organizationId: orgId,
-          identityId,
-          caCertificate,
-          allowedCommonNames: allowedCommonNames || undefined,
-          accessTokenTTL: Number(accessTokenTTL),
-          accessTokenMaxTTL: Number(accessTokenMaxTTL),
-          accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-          accessTokenTrustedIps
-        });
-      }
-
-      handlePopUpToggle("identityAuthMethod", false);
-
-      createNotification({
-        text: `Successfully ${isUpdate ? "updated" : "configured"} auth method`,
-        type: "success"
-      });
-
-      reset();
-    } catch {
-      createNotification({
-        text: `Failed to ${isUpdate ? "update" : "configure"} identity`,
-        type: "error"
-      });
-    }
-  };
-
-  return (
-    <form onSubmit={handleSubmit(onFormSubmit)}>
-      <Tabs value={tabValue} onValueChange={(value) => setTabValue(value as IdentityFormTab)}>
-        <TabList>
-          <Tab value={IdentityFormTab.Configuration}>Configuration</Tab>
-          <Tab value={IdentityFormTab.Advanced}>Advanced</Tab>
-        </TabList>
-        <TabPanel value={IdentityFormTab.Configuration}>
-          <Controller
-            control={control}
-            name="caCertificate"
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                label="CA Certificate"
-                errorText={error?.message}
-                isError={Boolean(error)}
-                tooltipText="A PEM-encoded CA certificate. This will be used to validate client certificate."
-              >
-                <TextArea {...field} placeholder="-----BEGIN CERTIFICATE----- ..." />
-              </FormControl>
-            )}
-          />
-
-          <Controller
-            control={control}
-            defaultValue=""
-            name="allowedCommonNames"
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                label="Allowed Common Names"
-                isError={Boolean(error)}
-                isOptional
-                errorText={error?.message}
-                tooltipText="Comma separated common names allowed to authenticate against the identity. Leave empty to allow any certificate."
-              >
-                <Input {...field} placeholder="" type="text" />
-              </FormControl>
-            )}
-          />
-          <Controller
-            control={control}
-            defaultValue="2592000"
-            name="accessTokenTTL"
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                label="Access Token TTL (seconds)"
-                tooltipText="The lifetime for an access token in seconds. This value will be referenced at renewal time."
-                isError={Boolean(error)}
-                errorText={error?.message}
-              >
-                <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
-              </FormControl>
-            )}
-          />
-          <Controller
-            control={control}
-            defaultValue="2592000"
-            name="accessTokenMaxTTL"
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                label="Access Token Max TTL (seconds)"
-                isError={Boolean(error)}
-                errorText={error?.message}
-                tooltipText="The maximum lifetime for an access token in seconds. This value will be referenced at renewal time."
-              >
-                <Input {...field} placeholder="2592000" type="number" min="0" step="1" />
-              </FormControl>
-            )}
-          />
-          <Controller
-            control={control}
-            defaultValue="0"
-            name="accessTokenNumUsesLimit"
-            render={({ field, fieldState: { error } }) => (
-              <FormControl
-                label="Access Token Max Number of Uses"
-                isError={Boolean(error)}
-                errorText={error?.message}
-                tooltipText="The maximum number of times that an access token can be used; a value of 0 implies infinite number of uses."
-              >
-                <Input {...field} placeholder="0" type="number" min="0" step="1" />
-              </FormControl>
-            )}
-          />
-        </TabPanel>
-        <TabPanel value={IdentityFormTab.Advanced}>
-          {accessTokenTrustedIpsFields.map(({ id }, index) => (
-            <div className="mb-3 flex items-end space-x-2" key={id}>
-              <Controller
-                control={control}
-                name={`accessTokenTrustedIps.${index}.ipAddress`}
-                defaultValue="0.0.0.0/0"
-                render={({ field, fieldState: { error } }) => {
-                  return (
-                    <FormControl
-                      className="mb-0 flex-grow"
-                      label={index === 0 ? "Access Token Trusted IPs" : undefined}
-                      isError={Boolean(error)}
-                      errorText={error?.message}
-                      tooltipText="The IPs or CIDR ranges that access tokens can be used from. By default, each token is given the 0.0.0.0/0, allowing usage from any network address."
-                    >
-                      <Input
-                        value={field.value}
-                        onChange={(e) => {
-                          if (subscription?.ipAllowlisting) {
-                            field.onChange(e);
-                            return;
-                          }
-
-                          handlePopUpOpen("upgradePlan");
-                        }}
-                        placeholder="123.456.789.0"
-                      />
-                    </FormControl>
-                  );
-                }}
-              />
-              <IconButton
-                onClick={() => {
-                  if (subscription?.ipAllowlisting) {
-                    removeAccessTokenTrustedIp(index);
-                    return;
-                  }
-
-                  handlePopUpOpen("upgradePlan");
-                }}
-                size="lg"
-                colorSchema="danger"
-                variant="plain"
-                ariaLabel="update"
-                className="p-3"
-              >
-                <FontAwesomeIcon icon={faXmark} />
-              </IconButton>
-            </div>
-          ))}
-          <div className="my-4 ml-1">
-            <Button
-              variant="outline_bg"
-              onClick={() => {
-                if (subscription?.ipAllowlisting) {
-                  appendAccessTokenTrustedIp({
-                    ipAddress: "0.0.0.0/0"
-                  });
-                  return;
-                }
-
-                handlePopUpOpen("upgradePlan");
-              }}
-              leftIcon={<FontAwesomeIcon icon={faPlus} />}
-              size="xs"
-            >
-              Add IP Address
-            </Button>
-          </div>
-        </TabPanel>
-      </Tabs>
-      <div className="flex items-center">
-        <Button
-          className="mr-4"
-          size="sm"
-          type="submit"
-          isLoading={isSubmitting}
-          isDisabled={isSubmitting}
-        >
-          {isUpdate ? "Update" : "Add"}
-        </Button>
-
-        <Button
-          colorSchema="secondary"
-          variant="plain"
-          onClick={() => handlePopUpToggle("identityAuthMethod", false)}
-        >
-          Cancel
-        </Button>
-      </div>
-    </form>
-  );
-};

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx

@@ -115,12 +115,12 @@ export const OrgMembersSection = () => {
 
   return (
     <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-      <div className="mb-4 flex items-center justify-between">
+      <div className="mb-4 flex justify-between">
         <p className="text-xl font-semibold text-mineshaft-100">Users</p>
         <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Member}>
           {(isAllowed) => (
             <Button
-              colorSchema="secondary"
+              colorSchema="primary"
               type="submit"
               leftIcon={<FontAwesomeIcon icon={faPlus} />}
               onClick={() => handleAddMemberModal()}

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx

@@ -4,14 +4,11 @@ import {
   faArrowUp,
   faCheckCircle,
   faChevronRight,
-  faEdit,
-  faEllipsisV,
+  faEllipsis,
   faFilter,
   faMagnifyingGlass,
   faSearch,
-  faUsers,
-  faUserSlash,
-  faUserXmark
+  faUsers
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
@@ -82,8 +79,7 @@ type Props = {
 
 enum OrgMembersOrderBy {
   Name = "firstName",
-  Email = "email",
-  Role = "role"
+  Email = "email"
 }
 
 type Filter = {
@@ -103,10 +99,8 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
   const { data: serverDetails } = useFetchServerStatus();
   const { data: members = [], isPending: isMembersLoading } = useGetOrgUsers(orgId);
 
-  const { mutateAsync: resendOrgMemberInvitation, isPending: isResendInvitePending } =
-    useResendOrgMemberInvitation();
+  const { mutateAsync: resendOrgMemberInvitation } = useResendOrgMemberInvitation();
   const { mutateAsync: updateOrgMembership } = useUpdateOrgMembership();
-  const [resendInviteId, setResendInviteId] = useState<string | null>(null);
 
   const onRoleChange = async (membershipId: string, role: string) => {
     if (!currentOrg?.id) return;
@@ -142,7 +136,6 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
   };
 
   const onResendInvite = async (membershipId: string) => {
-    setResendInviteId(membershipId);
     try {
       const signupToken = await resendOrgMemberInvitation({
         membershipId
@@ -163,8 +156,6 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
         text: "Failed to resend org invitation",
         type: "error"
       });
-    } finally {
-      setResendInviteId(null);
     }
   };
 
@@ -238,16 +229,6 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
               valueOne = memberOne.user.email || memberOne.inviteEmail;
               valueTwo = memberTwo.user.email || memberTwo.inviteEmail;
               break;
-            case OrgMembersOrderBy.Role:
-              valueOne =
-                memberOne.role === "custom"
-                  ? findRoleFromId(memberOne.roleId)!.slug
-                  : memberOne.role;
-              valueTwo =
-                memberTwo.role === "custom"
-                  ? findRoleFromId(memberTwo.roleId)!.slug
-                  : memberTwo.role;
-              break;
             case OrgMembersOrderBy.Name:
             default:
               valueOne = memberOne.user.firstName;
@@ -303,7 +284,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
               variant="plain"
               size="sm"
               className={twMerge(
-                "flex h-[2.375rem] w-[2.6rem] items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
                 isTableFiltered && "border-primary/50 text-primary"
               )}
             >
@@ -397,26 +378,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                   </IconButton>
                 </div>
               </Th>
-              <Th className="w-1/3">
-                <div className="flex items-center">
-                  Role
-                  <IconButton
-                    variant="plain"
-                    className={`ml-2 ${orderBy === OrgMembersOrderBy.Role ? "" : "opacity-30"}`}
-                    ariaLabel="sort"
-                    onClick={() => handleSort(OrgMembersOrderBy.Role)}
-                  >
-                    <FontAwesomeIcon
-                      icon={
-                        orderDirection === OrderByDirection.DESC &&
-                        orderBy === OrgMembersOrderBy.Role
-                          ? faArrowUp
-                          : faArrowDown
-                      }
-                    />
-                  </IconButton>
-                </div>
-              </Th>
+              <Th>Role</Th>
               <Th className="w-5" />
             </Tr>
           </THead>
@@ -436,7 +398,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                     isActive
                   }) => {
                     const name =
-                      u && u.firstName ? `${u.firstName} ${u.lastName ?? ""}`.trim() : null;
+                      u && u.firstName ? `${u.firstName} ${u.lastName ?? ""}`.trim() : "-";
                     const email = u?.email || inviteEmail;
                     const username = u?.username ?? inviteEmail ?? "-";
                     return (
@@ -453,7 +415,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                         }
                       >
                         <Td className={isActive ? "" : "text-mineshaft-400"}>
-                          {name ?? <span className="text-mineshaft-400">Not Set</span>}
+                          {name}
                           {u.superAdmin && (
                             <Badge variant="primary" className="ml-2">
                               Server Admin
@@ -467,77 +429,79 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                             a={OrgPermissionSubjects.Member}
                           >
                             {(isAllowed) => (
-                              <Select
-                                value={role === "custom" ? findRoleFromId(roleId)?.slug : role}
-                                isDisabled={userId === u?.id || !isAllowed}
-                                className="h-8 w-48 bg-mineshaft-700"
-                                position="popper"
-                                dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
-                                onValueChange={(selectedRole) =>
-                                  onRoleChange(orgMembershipId, selectedRole)
-                                }
-                              >
-                                {(roles || [])
-                                  .filter(({ slug }) =>
-                                    slug === "owner" ? isIamOwner || role === "owner" : true
-                                  )
-                                  .map(({ slug, name: roleName }) => (
-                                    <SelectItem value={slug} key={`owner-option-${slug}`}>
-                                      {roleName}
-                                    </SelectItem>
-                                  ))}
-                              </Select>
-                            )}
-                          </OrgPermissionCan>
-                        </Td>
-                        <Td>
-                          <div className="flex items-center justify-end gap-6">
-                            {isActive &&
-                              (status === "invited" || status === "verified") &&
-                              email &&
-                              serverDetails?.emailConfigured && (
-                                <OrgPermissionCan
-                                  I={OrgPermissionActions.Edit}
-                                  a={OrgPermissionSubjects.Member}
-                                >
-                                  {(isAllowed) => (
+                              <>
+                                {!isActive && (
+                                  <Button
+                                    isDisabled
+                                    className="w-40"
+                                    colorSchema="primary"
+                                    variant="outline_bg"
+                                    onClick={() => {}}
+                                  >
+                                    Suspended
+                                  </Button>
+                                )}
+                                {isActive && status === "accepted" && (
+                                  <Select
+                                    value={role === "custom" ? findRoleFromId(roleId)?.slug : role}
+                                    isDisabled={userId === u?.id || !isAllowed}
+                                    className="w-48 bg-mineshaft-600"
+                                    dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
+                                    onValueChange={(selectedRole) =>
+                                      onRoleChange(orgMembershipId, selectedRole)
+                                    }
+                                  >
+                                    {(roles || [])
+                                      .filter(({ slug }) =>
+                                        slug === "owner" ? isIamOwner || role === "owner" : true
+                                      )
+                                      .map(({ slug, name: roleName }) => (
+                                        <SelectItem value={slug} key={`owner-option-${slug}`}>
+                                          {roleName}
+                                        </SelectItem>
+                                      ))}
+                                  </Select>
+                                )}
+                                {isActive &&
+                                  (status === "invited" || status === "verified") &&
+                                  email &&
+                                  serverDetails?.emailConfigured && (
                                     <Button
-                                      isDisabled={!isAllowed || isResendInvitePending}
-                                      className="h-8 border-mineshaft-600 bg-mineshaft-700 font-normal"
+                                      isDisabled={!isAllowed}
+                                      className="w-48"
                                       colorSchema="primary"
                                       variant="outline_bg"
-                                      isLoading={
-                                        isResendInvitePending && resendInviteId === orgMembershipId
-                                      }
                                       onClick={(e) => {
                                         onResendInvite(orgMembershipId);
                                         e.stopPropagation();
                                       }}
                                     >
-                                      Resend Invite
+                                      Resend invite
                                     </Button>
                                   )}
-                                </OrgPermissionCan>
-                              )}
+                              </>
+                            )}
+                          </OrgPermissionCan>
+                        </Td>
+                        <Td>
+                          {userId !== u?.id && (
                             <DropdownMenu>
-                              <DropdownMenuTrigger asChild>
-                                <IconButton
-                                  ariaLabel="Options"
-                                  colorSchema="secondary"
-                                  className={twMerge("w-6", userId === u?.id && "opacity-50")}
-                                  variant="plain"
-                                  isDisabled={userId === u?.id}
-                                >
-                                  <FontAwesomeIcon icon={faEllipsisV} />
-                                </IconButton>
+                              <DropdownMenuTrigger asChild className="rounded-lg">
+                                <div className="hover:text-primary-400 data-[state=open]:text-primary-400">
+                                  <FontAwesomeIcon size="sm" icon={faEllipsis} />
+                                </div>
                               </DropdownMenuTrigger>
-                              <DropdownMenuContent sideOffset={2} align="end">
+                              <DropdownMenuContent align="start" className="p-1">
                                 <OrgPermissionCan
                                   I={OrgPermissionActions.Edit}
                                   a={OrgPermissionSubjects.Member}
                                 >
                                   {(isAllowed) => (
                                     <DropdownMenuItem
+                                      className={twMerge(
+                                        !isAllowed &&
+                                          "pointer-events-none cursor-not-allowed opacity-50"
+                                      )}
                                       onClick={(e) => {
                                         e.stopPropagation();
                                         navigate({
@@ -547,8 +511,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                           }
                                         });
                                       }}
-                                      isDisabled={!isAllowed}
-                                      icon={<FontAwesomeIcon icon={faEdit} />}
+                                      disabled={!isAllowed}
                                     >
                                       Edit User
                                     </DropdownMenuItem>
@@ -560,7 +523,15 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                 >
                                   {(isAllowed) => (
                                     <DropdownMenuItem
-                                      icon={<FontAwesomeIcon icon={faUserSlash} />}
+                                      className={
+                                        isActive
+                                          ? twMerge(
+                                              isAllowed
+                                                ? "hover:!bg-red-500 hover:!text-white"
+                                                : "pointer-events-none cursor-not-allowed opacity-50"
+                                            )
+                                          : ""
+                                      }
                                       onClick={async (e) => {
                                         e.stopPropagation();
 
@@ -589,7 +560,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                           username
                                         });
                                       }}
-                                      isDisabled={!isAllowed}
+                                      disabled={!isAllowed}
                                     >
                                       {`${isActive ? "Deactivate" : "Activate"} User`}
                                     </DropdownMenuItem>
@@ -601,6 +572,11 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                 >
                                   {(isAllowed) => (
                                     <DropdownMenuItem
+                                      className={twMerge(
+                                        isAllowed
+                                          ? "hover:!bg-red-500 hover:!text-white"
+                                          : "pointer-events-none cursor-not-allowed opacity-50"
+                                      )}
                                       onClick={(e) => {
                                         e.stopPropagation();
 
@@ -617,8 +593,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                           username
                                         });
                                       }}
-                                      isDisabled={!isAllowed}
-                                      icon={<FontAwesomeIcon icon={faUserXmark} />}
+                                      disabled={!isAllowed}
                                     >
                                       Remove User
                                     </DropdownMenuItem>
@@ -626,7 +601,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                 </OrgPermissionCan>
                               </DropdownMenuContent>
                             </DropdownMenu>
-                          </div>
+                          )}
                         </Td>
                       </Tr>
                     );

frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTabSection.tsx

@@ -6,10 +6,10 @@ export const OrgRoleTabSection = () => {
   return (
     <motion.div
       key="role-list"
-      transition={{ duration: 0.15 }}
-      initial={{ opacity: 0, translateX: 30 }}
+      transition={{ duration: 0.1 }}
+      initial={{ opacity: 0, translateX: -30 }}
       animate={{ opacity: 1, translateX: 0 }}
-      exit={{ opacity: 0, translateX: 30 }}
+      exit={{ opacity: 0, translateX: -30 }}
     >
       <OrgRoleTable />
     </motion.div>

frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx

@@ -1,17 +1,4 @@
-import { useMemo } from "react";
-import {
-  faArrowDown,
-  faArrowUp,
-  faCopy,
-  faEdit,
-  faEllipsisV,
-  faEye,
-  faIdBadge,
-  faMagnifyingGlass,
-  faPlus,
-  faSearch,
-  faTrash
-} from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
 import { twMerge } from "tailwind-merge";
@@ -27,10 +14,6 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-  EmptyState,
-  IconButton,
-  Input,
-  Pagination,
   Table,
   TableContainer,
   TableSkeleton,
@@ -47,25 +30,13 @@ import {
   useOrganization,
   useSubscription
 } from "@app/context";
-import { isCustomOrgRole, isCustomProjectRole } from "@app/helpers/roles";
-import {
-  getUserTablePreference,
-  PreferenceKey,
-  setUserTablePreference
-} from "@app/helpers/userTablePreferences";
-import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
+import { isCustomOrgRole } from "@app/helpers/roles";
+import { usePopUp } from "@app/hooks";
 import { useDeleteOrgRole, useGetOrgRoles, useUpdateOrg } from "@app/hooks/api";
-import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { TOrgRole } from "@app/hooks/api/roles/types";
 import { DuplicateOrgRoleModal } from "@app/pages/organization/RoleByIDPage/components/DuplicateOrgRoleModal";
 import { RoleModal } from "@app/pages/organization/RoleByIDPage/components/RoleModal";
 
-enum RolesOrderBy {
-  Name = "name",
-  Slug = "slug",
-  Type = "type"
-}
-
 export const OrgRoleTable = () => {
   const navigate = useNavigate();
   const { currentOrg } = useOrganization();
@@ -122,89 +93,14 @@ export const OrgRoleTable = () => {
     }
   };
 
-  const {
-    orderDirection,
-    toggleOrderDirection,
-    orderBy,
-    setOrderDirection,
-    setOrderBy,
-    search,
-    setSearch,
-    page,
-    perPage,
-    setPerPage,
-    setPage,
-    offset
-  } = usePagination<RolesOrderBy>(RolesOrderBy.Type, {
-    initPerPage: getUserTablePreference("orgRolesTable", PreferenceKey.PerPage, 20)
-  });
-
-  const handlePerPageChange = (newPerPage: number) => {
-    setPerPage(newPerPage);
-    setUserTablePreference("orgRolesTable", PreferenceKey.PerPage, newPerPage);
-  };
-
-  const filteredRoles = useMemo(
-    () =>
-      roles
-        ?.filter((role) => {
-          const { slug, name } = role;
-
-          const searchValue = search.trim().toLowerCase();
-
-          return (
-            name.toLowerCase().includes(searchValue) || slug.toLowerCase().includes(searchValue)
-          );
-        })
-        .sort((a, b) => {
-          const [roleOne, roleTwo] = orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
-
-          switch (orderBy) {
-            case RolesOrderBy.Slug:
-              return roleOne.slug.toLowerCase().localeCompare(roleTwo.slug.toLowerCase());
-            case RolesOrderBy.Type: {
-              const roleOneValue = isCustomOrgRole(roleOne.slug) ? -1 : 1;
-              const roleTwoValue = isCustomOrgRole(roleTwo.slug) ? -1 : 1;
-
-              return roleTwoValue - roleOneValue;
-            }
-            case RolesOrderBy.Name:
-            default:
-              return roleOne.name.toLowerCase().localeCompare(roleTwo.name.toLowerCase());
-          }
-        }) ?? [],
-    [roles, orderDirection, search, orderBy]
-  );
-
-  useResetPageHelper({
-    totalCount: filteredRoles.length,
-    offset,
-    setPage
-  });
-
-  const handleSort = (column: RolesOrderBy) => {
-    if (column === orderBy) {
-      toggleOrderDirection();
-      return;
-    }
-
-    setOrderBy(column);
-    setOrderDirection(OrderByDirection.ASC);
-  };
-
-  const getClassName = (col: RolesOrderBy) => twMerge("ml-2", orderBy === col ? "" : "opacity-30");
-
-  const getColSortIcon = (col: RolesOrderBy) =>
-    orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
-
   return (
     <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-      <div className="mb-4 flex items-center justify-between">
+      <div className="mb-4 flex justify-between">
         <p className="text-xl font-semibold text-mineshaft-100">Organization Roles</p>
         <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Role}>
           {(isAllowed) => (
             <Button
-              colorSchema="secondary"
+              colorSchema="primary"
               type="submit"
               leftIcon={<FontAwesomeIcon icon={faPlus} />}
               onClick={() => {
@@ -217,63 +113,18 @@ export const OrgRoleTable = () => {
           )}
         </OrgPermissionCan>
       </div>
-      <Input
-        value={search}
-        onChange={(e) => setSearch(e.target.value)}
-        leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-        placeholder="Search roles..."
-        className="flex-1"
-        containerClassName="mb-4"
-      />
       <TableContainer>
         <Table>
           <THead>
             <Tr>
-              <Th>
-                <div className="flex items-center">
-                  Name
-                  <IconButton
-                    variant="plain"
-                    className={getClassName(RolesOrderBy.Name)}
-                    ariaLabel="sort"
-                    onClick={() => handleSort(RolesOrderBy.Name)}
-                  >
-                    <FontAwesomeIcon icon={getColSortIcon(RolesOrderBy.Name)} />
-                  </IconButton>
-                </div>
-              </Th>
-              <Th>
-                <div className="flex items-center">
-                  Slug
-                  <IconButton
-                    variant="plain"
-                    className={getClassName(RolesOrderBy.Slug)}
-                    ariaLabel="sort"
-                    onClick={() => handleSort(RolesOrderBy.Slug)}
-                  >
-                    <FontAwesomeIcon icon={getColSortIcon(RolesOrderBy.Slug)} />
-                  </IconButton>
-                </div>
-              </Th>
-              <Th>
-                <div className="flex items-center">
-                  Type
-                  <IconButton
-                    variant="plain"
-                    className={getClassName(RolesOrderBy.Type)}
-                    ariaLabel="sort"
-                    onClick={() => handleSort(RolesOrderBy.Type)}
-                  >
-                    <FontAwesomeIcon icon={getColSortIcon(RolesOrderBy.Type)} />
-                  </IconButton>
-                </div>
-              </Th>
+              <Th>Name</Th>
+              <Th>Slug</Th>
               <Th aria-label="actions" className="w-5" />
             </Tr>
           </THead>
           <TBody>
-            {isRolesLoading && <TableSkeleton columns={4} innerKey="org-roles" />}
-            {filteredRoles?.slice(offset, perPage * page).map((role) => {
+            {isRolesLoading && <TableSkeleton columns={3} innerKey="org-roles" />}
+            {roles?.map((role) => {
               const { id, name, slug } = role;
               const isNonMutatable = ["owner", "admin", "member", "no-access"].includes(slug);
               const isDefaultOrgRole = isCustomOrgRole(slug)
@@ -311,30 +162,23 @@ export const OrgRoleTable = () => {
                   <Td className="max-w-md overflow-hidden text-ellipsis whitespace-nowrap">
                     {slug}
                   </Td>
-                  <Td>
-                    <Badge className="w-min whitespace-nowrap bg-mineshaft-400/50 text-bunker-200">
-                      {isCustomProjectRole(slug) ? "Custom" : "Default"}
-                    </Badge>
-                  </Td>
                   <Td>
                     <DropdownMenu>
-                      <DropdownMenuTrigger asChild>
-                        <IconButton
-                          ariaLabel="Options"
-                          colorSchema="secondary"
-                          className="w-6"
-                          variant="plain"
-                        >
-                          <FontAwesomeIcon icon={faEllipsisV} />
-                        </IconButton>
+                      <DropdownMenuTrigger asChild className="rounded-lg">
+                        <div className="hover:text-primary-400 data-[state=open]:text-primary-400">
+                          <FontAwesomeIcon size="sm" icon={faEllipsis} />
+                        </div>
                       </DropdownMenuTrigger>
-                      <DropdownMenuContent className="min-w-[12rem]" sideOffset={2} align="end">
+                      <DropdownMenuContent align="start" className="p-1">
                         <OrgPermissionCan
                           I={OrgPermissionActions.Edit}
                           a={OrgPermissionSubjects.Role}
                         >
                           {(isAllowed) => (
                             <DropdownMenuItem
+                              className={twMerge(
+                                !isAllowed && "pointer-events-none cursor-not-allowed opacity-50"
+                              )}
                               onClick={(e) => {
                                 e.stopPropagation();
                                 navigate({
@@ -344,8 +188,7 @@ export const OrgRoleTable = () => {
                                   }
                                 });
                               }}
-                              isDisabled={!isAllowed}
-                              icon={<FontAwesomeIcon icon={isNonMutatable ? faEye : faEdit} />}
+                              disabled={!isAllowed}
                             >
                               {`${isNonMutatable ? "View" : "Edit"} Role`}
                             </DropdownMenuItem>
@@ -357,12 +200,14 @@ export const OrgRoleTable = () => {
                         >
                           {(isAllowed) => (
                             <DropdownMenuItem
+                              className={twMerge(
+                                !isAllowed && "pointer-events-none cursor-not-allowed opacity-50"
+                              )}
                               onClick={(e) => {
                                 e.stopPropagation();
                                 handlePopUpOpen("duplicateRole", role);
                               }}
-                              isDisabled={!isAllowed}
-                              icon={<FontAwesomeIcon icon={faCopy} />}
+                              disabled={!isAllowed}
                             >
                               Duplicate Role
                             </DropdownMenuItem>
@@ -375,12 +220,14 @@ export const OrgRoleTable = () => {
                           >
                             {(isAllowed) => (
                               <DropdownMenuItem
-                                isDisabled={!isAllowed}
+                                className={twMerge(
+                                  !isAllowed && "pointer-events-none cursor-not-allowed opacity-50"
+                                )}
+                                disabled={!isAllowed}
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   handleSetRoleAsDefault(slug);
                                 }}
-                                icon={<FontAwesomeIcon icon={faIdBadge} />}
                               >
                                 Set as Default Role
                               </DropdownMenuItem>
@@ -403,12 +250,16 @@ export const OrgRoleTable = () => {
                               >
                                 {(isAllowed) => (
                                   <DropdownMenuItem
+                                    className={twMerge(
+                                      isAllowed && !isDefaultOrgRole
+                                        ? "hover:!bg-red-500 hover:!text-white"
+                                        : "pointer-events-none cursor-not-allowed opacity-50"
+                                    )}
                                     onClick={(e) => {
                                       e.stopPropagation();
                                       handlePopUpOpen("deleteRole", role);
                                     }}
-                                    icon={<FontAwesomeIcon icon={faTrash} />}
-                                    isDisabled={!isAllowed || isDefaultOrgRole}
+                                    disabled={!isAllowed || isDefaultOrgRole}
                                   >
                                     Delete Role
                                   </DropdownMenuItem>
@@ -425,25 +276,6 @@ export const OrgRoleTable = () => {
             })}
           </TBody>
         </Table>
-        {Boolean(filteredRoles?.length) && (
-          <Pagination
-            count={filteredRoles!.length}
-            page={page}
-            perPage={perPage}
-            onChangePage={setPage}
-            onChangePerPage={handlePerPageChange}
-          />
-        )}
-        {!filteredRoles?.length && !isRolesLoading && (
-          <EmptyState
-            title={
-              roles?.length
-                ? "No roles match search..."
-                : "This organization does not have any roles"
-            }
-            icon={roles?.length ? faSearch : undefined}
-          />
-        )}
       </TableContainer>
       <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityAuthModal.tsx

@@ -15,7 +15,6 @@ import {
   useDeleteIdentityLdapAuth,
   useDeleteIdentityOciAuth,
   useDeleteIdentityOidcAuth,
-  useDeleteIdentityTlsCertAuth,
   useDeleteIdentityTokenAuth,
   useDeleteIdentityUniversalAuth
 } from "@app/hooks/api";
@@ -30,7 +29,6 @@ import { ViewIdentityKubernetesAuthContent } from "./ViewIdentityKubernetesAuthC
 import { ViewIdentityLdapAuthContent } from "./ViewIdentityLdapAuthContent";
 import { ViewIdentityOciAuthContent } from "./ViewIdentityOciAuthContent";
 import { ViewIdentityOidcAuthContent } from "./ViewIdentityOidcAuthContent";
-import { ViewIdentityTlsCertAuthContent } from "./ViewIdentityTlsCertAuthContent";
 import { ViewIdentityTokenAuthContent } from "./ViewIdentityTokenAuthContent";
 import { ViewIdentityUniversalAuthContent } from "./ViewIdentityUniversalAuthContent";
 
@@ -65,7 +63,6 @@ export const Content = ({
   const { mutateAsync: revokeTokenAuth } = useDeleteIdentityTokenAuth();
   const { mutateAsync: revokeKubernetesAuth } = useDeleteIdentityKubernetesAuth();
   const { mutateAsync: revokeGcpAuth } = useDeleteIdentityGcpAuth();
-  const { mutateAsync: revokeTlsCertAuth } = useDeleteIdentityTlsCertAuth();
   const { mutateAsync: revokeAwsAuth } = useDeleteIdentityAwsAuth();
   const { mutateAsync: revokeAzureAuth } = useDeleteIdentityAzureAuth();
   const { mutateAsync: revokeAliCloudAuth } = useDeleteIdentityAliCloudAuth();
@@ -96,10 +93,6 @@ export const Content = ({
       revokeMethod = revokeGcpAuth;
       Component = ViewIdentityGcpAuthContent;
       break;
-    case IdentityAuthMethod.TLS_CERT_AUTH:
-      revokeMethod = revokeTlsCertAuth;
-      Component = ViewIdentityTlsCertAuthContent;
-      break;
     case IdentityAuthMethod.AWS_AUTH:
       revokeMethod = revokeAwsAuth;
       Component = ViewIdentityAwsAuthContent;

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityTlsCertAuthContent.tsx

@@ -1,88 +0,0 @@
-import { faBan, faEye } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-import { Badge, EmptyState, Spinner, Tooltip } from "@app/components/v2";
-import { useGetIdentityTlsCertAuth } from "@app/hooks/api";
-import { IdentityTlsCertAuthForm } from "@app/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTlsCertAuthForm";
-
-import { IdentityAuthFieldDisplay } from "./IdentityAuthFieldDisplay";
-import { ViewAuthMethodProps } from "./types";
-import { ViewIdentityContentWrapper } from "./ViewIdentityContentWrapper";
-
-export const ViewIdentityTlsCertAuthContent = ({
-  identityId,
-  handlePopUpToggle,
-  handlePopUpOpen,
-  onDelete,
-  popUp
-}: ViewAuthMethodProps) => {
-  const { data, isPending } = useGetIdentityTlsCertAuth(identityId);
-
-  if (isPending) {
-    return (
-      <div className="flex w-full items-center justify-center">
-        <Spinner className="text-mineshaft-400" />
-      </div>
-    );
-  }
-
-  if (!data) {
-    return (
-      <EmptyState
-        icon={faBan}
-        title="Could not find TLS Certificate Auth associated with this Identity."
-      />
-    );
-  }
-
-  if (popUp.identityAuthMethod.isOpen) {
-    return (
-      <IdentityTlsCertAuthForm
-        identityId={identityId}
-        isUpdate
-        handlePopUpOpen={handlePopUpOpen}
-        handlePopUpToggle={handlePopUpToggle}
-      />
-    );
-  }
-
-  return (
-    <ViewIdentityContentWrapper
-      onEdit={() => handlePopUpOpen("identityAuthMethod")}
-      onDelete={onDelete}
-    >
-      <IdentityAuthFieldDisplay label="Access Token TTL (seconds)">
-        {data.accessTokenTTL}
-      </IdentityAuthFieldDisplay>
-      <IdentityAuthFieldDisplay label="Access Token Max TTL (seconds)">
-        {data.accessTokenMaxTTL}
-      </IdentityAuthFieldDisplay>
-      <IdentityAuthFieldDisplay label="Access Token Max Number of Uses">
-        {data.accessTokenNumUsesLimit}
-      </IdentityAuthFieldDisplay>
-      <IdentityAuthFieldDisplay label="Access Token Trusted IPs">
-        {data.accessTokenTrustedIps.map((ip) => ip.ipAddress).join(", ")}
-      </IdentityAuthFieldDisplay>
-      <IdentityAuthFieldDisplay className="col-span-2" label="CA Certificate">
-        <Tooltip
-          side="right"
-          className="max-w-xl p-2"
-          content={<p className="break-words rounded bg-mineshaft-600 p-2">{data.caCertificate}</p>}
-        >
-          <div className="w-min">
-            <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
-              <FontAwesomeIcon icon={faEye} />
-              <span>Reveal</span>
-            </Badge>
-          </div>
-        </Tooltip>
-      </IdentityAuthFieldDisplay>
-      <IdentityAuthFieldDisplay className="col-span-2" label="Allowed Common Names">
-        {data.allowedCommonNames
-          ?.split(",")
-          .map((cn) => cn.trim())
-          .join(", ")}
-      </IdentityAuthFieldDisplay>
-    </ViewIdentityContentWrapper>
-  );
-};

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx

@@ -197,7 +197,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
               variant="plain"
               size="sm"
               className={twMerge(
-                "flex h-[2.375rem] w-[2.6rem] items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
                 isTableFiltered && "border-primary/50 text-primary"
               )}
             >
@@ -298,8 +298,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
             {!isMembersLoading &&
               filteredUsers.slice(offset, perPage * page).map((projectMember) => {
                 const { user: u, inviteEmail, id: membershipId, roles } = projectMember;
-                const name =
-                  u.firstName || u.lastName ? `${u.firstName} ${u.lastName || ""}` : null;
+                const name = u.firstName || u.lastName ? `${u.firstName} ${u.lastName || ""}` : "-";
                 const email = u?.email || inviteEmail;
 
                 return (
@@ -329,7 +328,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
                       })
                     }
                   >
-                    <Td>{name ?? <span className="text-mineshaft-400">Not Set</span>}</Td>
+                    <Td>{name}</Td>
                     <Td>{email}</Td>
                     <Td>
                       <div className="flex items-center space-x-2">

frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx

@@ -18,7 +18,6 @@ import { twMerge } from "tailwind-merge";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import {
-  Badge,
   Button,
   DeleteActionModal,
   DropdownMenu,
@@ -40,7 +39,6 @@ import {
   Tr
 } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
-import { isCustomProjectRole } from "@app/helpers/roles";
 import {
   getUserTablePreference,
   PreferenceKey,
@@ -55,8 +53,7 @@ import { RoleModal } from "@app/pages/project/RoleDetailsBySlugPage/components/R
 
 enum RolesOrderBy {
   Name = "name",
-  Slug = "slug",
-  Type = "type"
+  Slug = "slug"
 }
 
 export const ProjectRoleList = () => {
@@ -101,7 +98,7 @@ export const ProjectRoleList = () => {
     setPerPage,
     setPage,
     offset
-  } = usePagination<RolesOrderBy>(RolesOrderBy.Type, {
+  } = usePagination<RolesOrderBy>(RolesOrderBy.Name, {
     initPerPage: getUserTablePreference("projectRolesTable", PreferenceKey.PerPage, 20)
   });
 
@@ -128,12 +125,6 @@ export const ProjectRoleList = () => {
           switch (orderBy) {
             case RolesOrderBy.Slug:
               return roleOne.slug.toLowerCase().localeCompare(roleTwo.slug.toLowerCase());
-            case RolesOrderBy.Type: {
-              const roleOneValue = isCustomProjectRole(roleOne.slug) ? -1 : 1;
-              const roleTwoValue = isCustomProjectRole(roleTwo.slug) ? -1 : 1;
-
-              return roleTwoValue - roleOneValue;
-            }
             case RolesOrderBy.Name:
             default:
               return roleOne.name.toLowerCase().localeCompare(roleTwo.name.toLowerCase());
@@ -219,24 +210,11 @@ export const ProjectRoleList = () => {
                   </IconButton>
                 </div>
               </Th>
-              <Th>
-                <div className="flex items-center">
-                  Type
-                  <IconButton
-                    variant="plain"
-                    className={getClassName(RolesOrderBy.Type)}
-                    ariaLabel="sort"
-                    onClick={() => handleSort(RolesOrderBy.Type)}
-                  >
-                    <FontAwesomeIcon icon={getColSortIcon(RolesOrderBy.Type)} />
-                  </IconButton>
-                </div>
-              </Th>
               <Th aria-label="actions" className="w-5" />
             </Tr>
           </THead>
           <TBody>
-            {isRolesLoading && <TableSkeleton columns={4} innerKey="project-roles" />}
+            {isRolesLoading && <TableSkeleton columns={3} innerKey="project-roles" />}
             {filteredRoles?.slice(offset, perPage * page).map((role) => {
               const { id, name, slug } = role;
               const isNonMutatable = Object.values(ProjectMembershipRole).includes(
@@ -259,11 +237,6 @@ export const ProjectRoleList = () => {
                 >
                   <Td>{name}</Td>
                   <Td>{slug}</Td>
-                  <Td>
-                    <Badge className="w-min whitespace-nowrap bg-mineshaft-400/50 text-bunker-200">
-                      {isCustomProjectRole(slug) ? "Custom" : "Default"}
-                    </Badge>
-                  </Td>
                   <Td>
                     <Tooltip className="max-w-sm text-center" content="Options">
                       <DropdownMenu>

frontend/src/pages/project/RoleDetailsBySlugPage/components/GeneralPermissionPolicies.tsx

@@ -12,7 +12,7 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";
 
-import { Button, Checkbox, IconButton, Select, SelectItem, Tag, Tooltip } from "@app/components/v2";
+import { Button, Checkbox, Select, SelectItem, Tag, Tooltip } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
 import { useToggle } from "@app/hooks";
 
@@ -241,19 +241,16 @@ export const GeneralPermissionPolicies = <T extends keyof NonNullable<TFormSchem
                         />
                       </Tooltip>
                       {!isDisabled && (
-                        <Tooltip content="Remove Rule">
-                          <IconButton
-                            ariaLabel="Remove rule"
-                            colorSchema="danger"
-                            variant="plain"
-                            size="xs"
-                            className="ml-auto mr-3 rounded"
-                            onClick={() => remove(rootIndex)}
-                            isDisabled={isDisabled}
-                          >
-                            <FontAwesomeIcon icon={faTrash} />
-                          </IconButton>
-                        </Tooltip>
+                        <Button
+                          leftIcon={<FontAwesomeIcon icon={faTrash} />}
+                          variant="outline_bg"
+                          size="xs"
+                          className="ml-auto mr-3"
+                          onClick={() => remove(rootIndex)}
+                          isDisabled={isDisabled}
+                        >
+                          Remove Rule
+                        </Button>
                       )}
                       {!isDisabled && (
                         <Tooltip position="left" content="Drag to reorder permission">
@@ -274,19 +271,16 @@ export const GeneralPermissionPolicies = <T extends keyof NonNullable<TFormSchem
                   <div className="flex w-full justify-between">
                     <div className="mb-2">Actions</div>
                     {!isDisabled && !isConditionalSubjects(subject) && (
-                      <Tooltip content="Remove Rule">
-                        <IconButton
-                          ariaLabel="Remove rule"
-                          colorSchema="danger"
-                          variant="plain"
-                          size="xs"
-                          className="ml-auto rounded"
-                          onClick={() => remove(rootIndex)}
-                          isDisabled={isDisabled}
-                        >
-                          <FontAwesomeIcon icon={faTrash} />
-                        </IconButton>
-                      </Tooltip>
+                      <Button
+                        leftIcon={<FontAwesomeIcon icon={faTrash} />}
+                        variant="outline_bg"
+                        size="xs"
+                        className="ml-auto"
+                        onClick={() => remove(rootIndex)}
+                        isDisabled={isDisabled}
+                      >
+                        Remove Rule
+                      </Button>
                     )}
                   </div>
                   <div className="flex flex-grow flex-wrap justify-start gap-x-8 gap-y-4">