Update hivegrid-cloud reference to latest main

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
davidandClaude Fable 5 committed 2026-07-08 16:15:37 +02:00
1 parent e98d38e716
commit 7b21524c86
3781 files changed
+373484 -225607

No files matched your search

@@ -8,10 +8,7 @@ vi.mock("~/utils/cache.server", () => ({
vi.mock("~/utils/entitlements/.server/productAccess.server", () => ({
resolveTenantProductAccess: vi.fn(),
}));
vi.mock("~/utils/services/.server/subscriptionService", () => ({
getActiveTenantSubscriptions: vi.fn(async () => null),
resolveTenantEntitlementSubscription: vi.fn(async () => null),
}));
vi.mock("~/utils/services/.server/featureFlagEvaluator.server", () => ({
@@ -19,13 +16,12 @@ vi.mock("~/utils/services/.server/featureFlagEvaluator.server", () => ({
}));
import { clearCacheKeyPrefix } from "~/utils/cache.server";
import { resolveTenantProductAccess } from "~/utils/entitlements/.server/productAccess.server";
import { getActiveTenantSubscriptions } from "~/utils/services/.server/subscriptionService";
import { resolveTenantEntitlementSubscription, resolveTenantProductAccess } from "~/utils/entitlements/.server/productAccess.server";
import { evaluateFlagForContext } from "~/utils/services/.server/featureFlagEvaluator.server";
import { invalidateTenantModuleAccessCache, tenantHasFlag, tenantHasModule } from "./tenantConnector.server";
const resolveMock = vi.mocked(resolveTenantProductAccess);
const subscriptionMock = vi.mocked(getActiveTenantSubscriptions);
const subscriptionMock = vi.mocked(resolveTenantEntitlementSubscription);
const flagMock = vi.mocked(evaluateFlagForContext);
const clearPrefixMock = vi.mocked(clearCacheKeyPrefix);
@@ -42,9 +38,7 @@ describe("tenantHasModule", () => {
expect(allowed).toBe(true);
expect(subscriptionMock).toHaveBeenCalledWith("t1");
expect(resolveMock).toHaveBeenCalledWith(
expect.objectContaining({ tenantId: "t1", userId: "u1", featureKey: "crm-basic" })
);
expect(resolveMock).toHaveBeenCalledWith(expect.objectContaining({ tenantId: "t1", userId: "u1", featureKey: "crm-basic" }));
});
it("returns false when the product-access decision denies the module", async () => {
@@ -1,6 +1,5 @@
import { cachified, clearCacheKeyPrefix } from "~/utils/cache.server";
import { resolveTenantProductAccess } from "~/utils/entitlements/.server/productAccess.server";
import { getActiveTenantSubscriptions } from "~/utils/services/.server/subscriptionService";
import { resolveTenantEntitlementSubscription, resolveTenantProductAccess } from "~/utils/entitlements/.server/productAccess.server";
import { evaluateFlagForContext } from "~/utils/services/.server/featureFlagEvaluator.server";
/**
@@ -10,10 +9,9 @@ import { evaluateFlagForContext } from "~/utils/services/.server/featureFlagEval
* Loader-Guard). Beide bauen auf bestehende Resolver auf, statt sie nachzubauen:
*
* - `tenantHasModule()` — "Darf dieser Tenant dieses Modul nutzen?" Brücke Billing↔Feature-Gate:
* prüft Abo/Entitlement (`SubscriptionFeature` über das aktive Tenant-Abo), Produkt-Blueprint,
* prüft lokalen Billing-State/Entitlements, Produkt-Blueprint,
* Tenant-Override und ggf. Tenant-Rollen-Permission via {@link resolveTenantProductAccess}.
* Die Modul-Entscheidung wird auf Connector-Ebene gecacht (`getActiveTenantSubscriptions` ist
* bereits gecacht; die zusätzlichen Konfigurations-/Override-/Permission-Queries nicht).
* Die Modul-Entscheidung wird auf Connector-Ebene gecacht.
*
* - `tenantHasFlag()` — "Ist dieses Feature-Flag für diesen Kontext aktiv?" Delegiert an den
* v2-Evaluator {@link evaluateFlagForContext}, der bereits eigenen Eval-Cache mitbringt.
@@ -51,7 +49,7 @@ export async function tenantHasModule(input: TenantModuleAccessInput): Promise<b
key: moduleCacheKey(input),
ttl: MODULE_CACHE_TTL_MS,
getFreshValue: async () => {
const subscription = await getActiveTenantSubscriptions(input.tenantId);
const subscription = await resolveTenantEntitlementSubscription(input.tenantId);
const decision = await resolveTenantProductAccess({
tenantId: input.tenantId,
userId: input.userId,
@@ -87,7 +85,7 @@ export async function tenantHasFlag(input: TenantFlagContext): Promise<boolean>
/**
* Verwirft alle gecachten Modul-Entscheidungen eines Tenants. Aufrufen nach Abo-/Override-/
* Rollen-Änderungen (z.B. Stripe-Webhook, Admin-Plan-Wechsel), damit das Gate sofort nachzieht.
* Rollen-Änderungen (z.B. Billing-Sync, Admin-Plan-Wechsel), damit das Gate sofort nachzieht.
*/
export function invalidateTenantModuleAccessCache(tenantId: string): void {
clearCacheKeyPrefix(`${MODULE_CACHE_PREFIX}${tenantId}:`);