Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge branch 'main' into feature/usage-breakdown

Victor Hugo dos Santosd6685c36379a
diff --cc backend/src/ee/routes/v1/license-v2-router.ts
index fbe99a164c,4f1976c8f4..cc16a35a10
--- a/backend/src/ee/routes/v1/license-v2-router.ts
+++ b/backend/src/ee/routes/v1/license-v2-router.ts
@@@ -1,12 -1,12 +1,14 @@@
import { FastifyRequest } from "fastify";
import { z } from "zod";
+import { BillingV2BreakdownDimension, BillingV2BreakdownScopeKind } from "@app/ee/services/license-v2/license-v2-types";
import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
+ import { getTelemetryDistinctId } from "@app/server/lib/telemetry";
import { isUserSessionAuth } from "@app/server/plugins/auth/inject-identity";
import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
import { AuthMode } from "@app/services/auth/auth-type";
+import { isSuperAdmin } from "@app/services/super-admin/super-admin-fns";
+ import { PostHogEventTypes } from "@app/services/telemetry/telemetry-types";
// The license server joins this onto its configured portal origin, so it must be a single-rooted
// relative path. Reject protocol-relative ("//host", "/\\host") values that browsers can normalize
diff --cc frontend/src/hooks/index.ts
index f632798a72,fa9e8d630e..aa686a9b25
--- a/frontend/src/hooks/index.ts
+++ b/frontend/src/hooks/index.ts
@@@ -3,9 -3,9 +3,10 @@@ export
useCanUseProjectAppConnectionImport
} from "./useCanUseAppConnectionImport";
export { useDebounce } from "./useDebounce";
+ export { useDelayedLoading } from "./useDelayedLoading";
export { useDiscardChangesGuard } from "./useDiscardChangesGuard";
export * from "./useGetProjectTypeFromRoute";
+export { useHeldLoading } from "./useHeldLoading";
export { useImplicitProduct } from "./useImplicitProduct";
export { useImplicitProjectId } from "./useImplicitProjectId";
export { useLastLogin } from "./useLastLogin";