🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
feat(rbac): add AI_GATEWAY organization membership role (#19262)
Mark Salpeter497818fc717c
diff --git a/packages/shared/prisma/migrations/20261022130000_add_ai_gateway_membership_role/migration.sql b/packages/shared/prisma/migrations/20261022130000_add_ai_gateway_membership_role/migration.sqlnew file mode 100644index 0000000000..7240a162de--- /dev/null+++ b/packages/shared/prisma/migrations/20261022130000_add_ai_gateway_membership_role/migration.sql@@ -0,0 +1 @@+ALTER TYPE "Role" ADD VALUE 'AI_GATEWAY';diff --git a/packages/shared/prisma/schema.prisma b/packages/shared/prisma/schema.prismaindex 819956a4ad..a679b1cb8f 100644--- a/packages/shared/prisma/schema.prisma+++ b/packages/shared/prisma/schema.prisma@@ -591,6 +591,7 @@ enum Role {MEMBERVIEWERNONE+ AI_GATEWAY}model TraceSession {diff --git a/packages/shared/src/features/rbac/organizationAccessRights.ts b/packages/shared/src/features/rbac/organizationAccessRights.tsindex df1b6c1aa1..c666f384ff 100644--- a/packages/shared/src/features/rbac/organizationAccessRights.ts+++ b/packages/shared/src/features/rbac/organizationAccessRights.ts@@ -1,6 +1,7 @@import { type Role } from "../../db";export const organizationScopes = [+ "organizationSettings:read","projects:read","projects:create","projects:transfer_org",@@ -25,6 +26,7 @@ export type OrganizationScope = (typeof organizationScopes)[number];export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {OWNER: [+ "organizationSettings:read","projects:create","projects:transfer_org","organization:CRUD_apiKeys",@@ -45,6 +47,7 @@ export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {"projects:read",],ADMIN: [+ "organizationSettings:read","projects:create","projects:transfer_org","organization:update",@@ -60,9 +63,15 @@ export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {// used for api keys"projects:read",],- MEMBER: ["gateway:read", "gateway:invoke", "organizationMembers:read"],- VIEWER: ["gateway:read"],- NONE: [],+ MEMBER: [+ "organizationSettings:read",+ "gateway:read",+ "gateway:invoke",+ "organizationMembers:read",+ ],+ VIEWER: ["organizationSettings:read", "gateway:read"],+ NONE: ["organizationSettings:read"],+ AI_GATEWAY: ["gateway:read", "gateway:invoke"],};export const orgNoneRoleComment =diff --git a/packages/shared/src/features/rbac/projectAccessRights.ts b/packages/shared/src/features/rbac/projectAccessRights.tsindex 264ac01b5d..beafadc469 100644--- a/packages/shared/src/features/rbac/projectAccessRights.ts+++ b/packages/shared/src/features/rbac/projectAccessRights.ts@@ -340,6 +340,7 @@ export const projectRoleAccessRights: Record<Role, ProjectScope[]> = {"traces:read",],NONE: [],+ AI_GATEWAY: [],};export const projectNoneRoleComment =diff --git a/packages/shared/src/features/rbac/systemRoleAccessRights.ts b/packages/shared/src/features/rbac/systemRoleAccessRights.tsindex f2a83b7f3b..8dc2d6826c 100644--- a/packages/shared/src/features/rbac/systemRoleAccessRights.ts+++ b/packages/shared/src/features/rbac/systemRoleAccessRights.ts@@ -170,8 +170,8 @@ export const systemRoleAccessRights: Record<SystemRole, SystemRoleDefinition> =id: "AI_GATEWAY",name: "AI Gateway",description: "Route model requests through the AI Gateway.",- policies: [allow("organization", ["gateway:invoke"])],- tags: ["principal:apiKey"],+ policies: [allow("organization", ["gateway:read", "gateway:invoke"])],+ tags: ["principal:user", "principal:apiKey"],},};diff --git a/packages/shared/src/server/auth/userProjectRoleAuth.ts b/packages/shared/src/server/auth/userProjectRoleAuth.tsindex ad371119a7..646ddeb46d 100644--- a/packages/shared/src/server/auth/userProjectRoleAuth.ts+++ b/packages/shared/src/server/auth/userProjectRoleAuth.ts@@ -2,6 +2,7 @@ import { prisma, Prisma, Role, ProjectMembership } from "../../db";import type { FilterState } from "../../types";import { tableColumnsToSqlFilterAndPrefix } from "../filterToPrisma";import { usersTableCols } from "../../tableDefinitions/usersTable";+import { hasProjectAccessByRole } from "../../features/rbac/projectAccessRights";export function resolveProjectRole({projectId,@@ -27,6 +28,7 @@ export function resolveProjectRole({* 3. MEMBER - Project member access* 4. VIEWER - Read-only project access* 5. NONE - No access (excluded from results)+ * 6. AI_GATEWAY - Org-level gateway access only (excluded unless granted a project role)** PRIORITY SYSTEM:* - Priority 1: Organization members without specific project roles (inherit org role)@@ -59,6 +61,11 @@ function generateUserProjectRolesQuery({page?: number;orderBy: Prisma.Sql;}) {+ const rolesWithoutProjectRead = Prisma.join(+ Object.values(Role).filter(+ (role) => !hasProjectAccessByRole({ role, scope: "project:read" }),+ ),+ );const sqlFilter = filterCondition? tableColumnsToSqlFilterAndPrefix(filterCondition, usersTableCols, "users"): Prisma.empty;@@ -69,7 +76,7 @@ function generateUserProjectRolesQuery({FROM organization_memberships omINNER JOIN users u ON om.user_id = u.idWHERE om.org_id = ${orgId}- AND om.role != 'NONE'+ AND om.role::text NOT IN (${rolesWithoutProjectRead})AND NOT EXISTS (SELECT 1 FROM project_memberships pmWHERE pm.org_membership_id = om.id@@ -84,7 +91,7 @@ function generateUserProjectRolesQuery({INNER JOIN users u ON om.user_id = u.idWHERE om.org_id = ${orgId}AND pm.project_id = ${projectId}- AND pm.role != 'NONE'+ AND pm.role::text NOT IN (${rolesWithoutProjectRead})${sqlFilter}${searchFilter})diff --git a/web/src/__tests__/organization-settings-pages.clienttest.tsx b/web/src/__tests__/organization-settings-pages.clienttest.tsxindex 5abb49f02f..5468965d60 100644--- a/web/src/__tests__/organization-settings-pages.clienttest.tsx+++ b/web/src/__tests__/organization-settings-pages.clienttest.tsx@@ -9,6 +9,9 @@ import { useIsCloudBillingAvailable } from "@/src/ee/features/billing";import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";import { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";import { env } from "@/src/env.mjs";+import { isCloudPlan } from "@langfuse/shared";+import { organizationRoleAccessRights } from "@langfuse/shared/rbac";+import { Role } from "@langfuse/shared/src/db";vi.mock("@/src/components/PagedSettingsContainer", () => ({PagedSettingsContainer: () => null,@@ -193,6 +196,9 @@ describe("useOrganizationSettingsPages", () => {});it("gates the v4 migration link on deployment availability", () => {+ vi.mocked(useHasOrganizationAccess).mockImplementation(+ ({ scope }) => scope === "organizationSettings:read",+ );const { result } = renderHook(() => useOrganizationSettingsPages());expect(@@ -380,7 +386,9 @@ describe("useOrganizationSettingsPages", () => {it("hides the usage page on cloud, where the billing page embeds the breakdown", () => {vi.mocked(useHasOrganizationAccess).mockImplementation(- ({ scope }) => scope === "organizationUsage:read",+ ({ scope }) =>+ scope === "organizationUsage:read" ||+ scope === "organizationSettings:read",);vi.mocked(useHasEntitlement).mockImplementation((entitlement) => entitlement === "cloud-billing",@@ -406,4 +414,84 @@ describe("useOrganizationSettingsPages", () => {false,);});++ describe("visible pages by role", () => {+ beforeEach(() => {+ vi.mocked(useHasEntitlement).mockReturnValue(true);+ vi.mocked(useIsCloudBillingAvailable).mockReturnValue(true);+ vi.mocked(useV4UpgradeUiFlag).mockReturnValue(true);+ vi.mocked(useIsFeatureEnabled).mockReturnValue(true);+ vi.mocked(isCloudPlan).mockReturnValue(true);+ });++ afterEach(() => {+ vi.mocked(isCloudPlan).mockReturnValue(false);+ });++ it("shows AI_GATEWAY members only their gateway keys and models", () => {+ grantScopesOf(Role.AI_GATEWAY);++ expect(visibleSlugs()).toEqual([+ "ai-gateway-models",+ "ai-gateway-api-keys",+ ]);+ });++ it("shows Projects to AI_GATEWAY members with a project", () => {+ grantScopesOf(Role.AI_GATEWAY);+ vi.mocked(useQueryProjectOrOrganization).mockReturnValue({+ organization: {+ ...organization,+ projects: [{ id: "project-1", name: "Project 1" }],+ },+ project: null,+ } as unknown as ReturnType<typeof useQueryProjectOrOrganization>);++ expect(visibleSlugs()).toEqual([+ "projects",+ "ai-gateway-models",+ "ai-gateway-api-keys",+ ]);+ });++ it("shows NONE members the organization overview pages", () => {+ grantScopesOf(Role.NONE);++ expect(visibleSlugs()).toEqual([+ "index",+ "members",+ "audit-logs",+ "billing",+ "sso",+ "projects",+ "v4-migration",+ ]);+ });++ it("shows VIEWER members the organization overview pages and models", () => {+ grantScopesOf(Role.VIEWER);++ expect(visibleSlugs()).toEqual([+ "index",+ "members",+ "audit-logs",+ "billing",+ "sso",+ "projects",+ "v4-migration",+ "ai-gateway-models",+ ]);+ });+ });});++function grantScopesOf(role: Role) {+ vi.mocked(useHasOrganizationAccess).mockImplementation(({ scope }) =>+ organizationRoleAccessRights[role].includes(scope),+ );+}++function visibleSlugs() {+ const { result } = renderHook(() => useOrganizationSettingsPages());+ return result.current.filter((page) => page.show ?? true).map((p) => p.slug);+}diff --git a/web/src/__tests__/server/members-trpc.servertest.ts b/web/src/__tests__/server/members-trpc.servertest.tsindex 35ffea91cc..08154c2097 100644--- a/web/src/__tests__/server/members-trpc.servertest.ts+++ b/web/src/__tests__/server/members-trpc.servertest.ts@@ -8,6 +8,7 @@ import { entitlementAccess } from "@/src/features/entitlements/constants/entitleimport type { Session } from "next-auth";import { createApiKey } from "@langfuse/shared/src/server";import { OrganizationId, SystemRoleId, UserId } from "@langfuse/shared/rbac";+import { env } from "@/src/env.mjs";// Session fixture sub-object types; casts keep the runtime fixtures unchanged// while satisfying newer required fields on the session user type.@@ -1226,3 +1227,191 @@ describe("membersRouter - gateway key revocation", () => {},);});++describe("membersRouter - AI_GATEWAY role", () => {+ const originalGatewayAllowlist = [+ ...env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST,+ ];+ const originalGatewayAvailability = {+ NODE_ENV: env.NODE_ENV,+ LANGFUSE_AI_GATEWAY_ENABLED: env.LANGFUSE_AI_GATEWAY_ENABLED,+ NEXT_PUBLIC_PREVIEW_PR_URL: env.NEXT_PUBLIC_PREVIEW_PR_URL,+ };++ // Only the org allowlist enables the gateway in these tests.+ beforeEach(() => {+ Object.assign(env, {+ NODE_ENV: "test",+ LANGFUSE_AI_GATEWAY_ENABLED: "false",+ NEXT_PUBLIC_PREVIEW_PR_URL: undefined,+ });+ });++ afterEach(() => {+ Object.assign(env, originalGatewayAvailability);+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST.splice(+ 0,+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST.length,+ ...originalGatewayAllowlist,+ );+ });++ it("adds an organization member with the AI_GATEWAY role", async () => {+ const { org, caller } = await prepare("cloud:core");+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST.push(org.id);+ const newUser = await createTestUser();++ await caller.members.create({+ orgId: org.id,+ email: newUser.email!,+ orgRole: Role.AI_GATEWAY,+ });++ const membership = await prisma.organizationMembership.findFirst({+ where: { orgId: org.id, userId: newUser.id },+ });+ expect(membership?.role).toBe(Role.AI_GATEWAY);+ });++ it("rejects adding an AI_GATEWAY member while the AI Gateway is off", async () => {+ const { org, caller } = await prepare("cloud:core");+ const newUser = await createTestUser();++ await expect(+ caller.members.create({+ orgId: org.id,+ email: newUser.email!,+ orgRole: Role.AI_GATEWAY,+ }),+ ).rejects.toMatchObject({ code: "FORBIDDEN" });+ expect(+ await prisma.organizationMembership.count({+ where: { orgId: org.id, userId: newUser.id },+ }),+ ).toBe(0);+ });++ it("rejects changing a member to AI_GATEWAY while the AI Gateway is off", async () => {+ const { org, caller } = await prepare("cloud:core");+ const member = await createTestUser();+ const membership = await prisma.organizationMembership.create({+ data: { userId: member.id, orgId: org.id, role: Role.MEMBER },+ });++ await expect(+ caller.members.updateOrgMembership({+ orgId: org.id,+ orgMembershipId: membership.id,+ role: Role.AI_GATEWAY,+ }),+ ).rejects.toMatchObject({ code: "FORBIDDEN" });+ expect(+ (+ await prisma.organizationMembership.findUnique({+ where: { id: membership.id },+ })+ )?.role,+ ).toBe(Role.MEMBER);+ });++ it("changes a member to AI_GATEWAY while the AI Gateway is on", async () => {+ const { org, caller } = await prepare("cloud:core");+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST.push(org.id);+ const member = await createTestUser();+ const membership = await prisma.organizationMembership.create({+ data: { userId: member.id, orgId: org.id, role: Role.MEMBER },+ });++ await caller.members.updateOrgMembership({+ orgId: org.id,+ orgMembershipId: membership.id,+ role: Role.AI_GATEWAY,+ });++ expect(+ (+ await prisma.organizationMembership.findUnique({+ where: { id: membership.id },+ })+ )?.role,+ ).toBe(Role.AI_GATEWAY);+ });++ it("rejects AI_GATEWAY as a project role", async () => {+ const { org, project, caller } = await prepare("cloud:core");+ const newUser = await createTestUser();++ await expect(+ caller.members.create({+ orgId: org.id,+ email: newUser.email!,+ orgRole: Role.NONE,+ projectId: project.id,+ projectRole: Role.AI_GATEWAY as never,+ }),+ ).rejects.toThrow();+ });++ it("omits AI_GATEWAY members from project-scoped member lists", async () => {+ const { org, project } = await prepare("cloud:core");+ const gatewayUser = await createTestUser();+ await prisma.organizationMembership.create({+ data: { userId: gatewayUser.id, orgId: org.id, role: Role.AI_GATEWAY },+ });+ const projectOnlyUser = await createTestUser();+ const orgMembership = await prisma.organizationMembership.create({+ data: { userId: projectOnlyUser.id, orgId: org.id, role: Role.NONE },+ });+ await prisma.projectMembership.create({+ data: {+ userId: projectOnlyUser.id,+ projectId: project.id,+ role: Role.MEMBER,+ orgMembershipId: orgMembership.id,+ },+ });+ const ctx = createInnerTRPCContext({+ session: createSession(projectOnlyUser, org, project, "cloud:core", {+ orgRole: Role.NONE,+ projectRole: Role.MEMBER,+ }),+ headers: {},+ });+ const caller = appRouter.createCaller({ ...ctx, prisma });++ const result = await caller.members.allFromProject({+ projectId: project.id,+ page: 0,+ limit: 10,+ });++ expect(result.memberships.map((m) => m.userId)).not.toContain(+ gatewayUser.id,+ );+ });+ it("lists AI_GATEWAY members with a project role in that project", async () => {+ const { org, project, caller } = await prepare("cloud:core");+ const gatewayUser = await createTestUser();+ const gatewayMembership = await prisma.organizationMembership.create({+ data: { userId: gatewayUser.id, orgId: org.id, role: Role.AI_GATEWAY },+ });+ await prisma.projectMembership.create({+ data: {+ userId: gatewayUser.id,+ projectId: project.id,+ role: Role.VIEWER,+ orgMembershipId: gatewayMembership.id,+ },+ });++ const result = await caller.members.allFromProject({+ projectId: project.id,+ page: 0,+ limit: 10,+ });++ expect(+ result.memberships.find((m) => m.userId === gatewayUser.id)?.projectRole,+ ).toBe(Role.VIEWER);+ });+});diff --git a/web/src/__tests__/server/memberships-api.servertest.ts b/web/src/__tests__/server/memberships-api.servertest.tsindex c48988d177..34540e991f 100644--- a/web/src/__tests__/server/memberships-api.servertest.ts+++ b/web/src/__tests__/server/memberships-api.servertest.ts@@ -5,7 +5,7 @@ import {import { prisma } from "@langfuse/shared/src/db";import { z } from "zod";import { randomUUID } from "crypto";-import { Role } from "@langfuse/shared";+import { ForbiddenError, Role } from "@langfuse/shared";import projectMembershipRoute from "@/src/pages/api/public/projects/[projectId]/memberships";import { env } from "@/src/env.mjs";import { createMocks } from "node-mocks-http";@@ -960,6 +960,66 @@ describe("Organization membership safeguards", () => {},);});++ describe("AI_GATEWAY role", () => {+ const originalGatewayAvailability = {+ NODE_ENV: env.NODE_ENV,+ LANGFUSE_AI_GATEWAY_ENABLED: env.LANGFUSE_AI_GATEWAY_ENABLED,+ NEXT_PUBLIC_PREVIEW_PR_URL: env.NEXT_PUBLIC_PREVIEW_PR_URL,+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST:+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST,+ };+ const putRole = async (role: Role) => {+ const { req, res } = createMocks<NextApiRequest, NextApiResponse>({+ method: "PUT",+ body: { userId: memberId, role },+ });+ await handleUpdateMembership(req, res, orgId, apiKeyId, ownerContext);+ return res.statusCode;+ };++ // Only the org allowlist enables the gateway in these tests.+ beforeEach(() => {+ Object.assign(env, {+ NODE_ENV: "test",+ LANGFUSE_AI_GATEWAY_ENABLED: "false",+ NEXT_PUBLIC_PREVIEW_PR_URL: undefined,+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST: [],+ });+ });++ afterEach(() => {+ Object.assign(env, originalGatewayAvailability);+ });++ it("rejects setting AI_GATEWAY while the AI Gateway is off", async () => {+ await expect(putRole(Role.AI_GATEWAY)).rejects.toThrow(ForbiddenError);++ expect((await membership(memberId))?.role).toBe(Role.MEMBER);+ expect(await logs()).toEqual([]);+ });++ it("keeps an existing AI_GATEWAY member re-sent while the AI Gateway is off", async () => {+ await prisma.organizationMembership.update({+ where: { orgId_userId: { orgId, userId: memberId } },+ data: { role: Role.AI_GATEWAY },+ });++ expect(await putRole(Role.AI_GATEWAY)).toBe(200);++ expect((await membership(memberId))?.role).toBe(Role.AI_GATEWAY);+ });++ it("sets AI_GATEWAY while the AI Gateway is on for the org", async () => {+ Object.assign(env, {+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST: [orgId],+ });++ expect(await putRole(Role.AI_GATEWAY)).toBe(200);++ expect((await membership(memberId))?.role).toBe(Role.AI_GATEWAY);+ });+ });});describe("Project membership safeguards", () => {diff --git a/web/src/__tests__/server/scim-api.servertest.ts b/web/src/__tests__/server/scim-api.servertest.tsindex b6fa1cda3a..d4fe09969b 100644--- a/web/src/__tests__/server/scim-api.servertest.ts+++ b/web/src/__tests__/server/scim-api.servertest.ts@@ -2160,4 +2160,73 @@ describe("SCIM ownership boundary", () => {},);});++ describe("AI_GATEWAY role", () => {+ const originalGatewayAvailability = {+ NODE_ENV: env.NODE_ENV,+ LANGFUSE_AI_GATEWAY_ENABLED: env.LANGFUSE_AI_GATEWAY_ENABLED,+ NEXT_PUBLIC_PREVIEW_PR_URL: env.NEXT_PUBLIC_PREVIEW_PR_URL,+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST:+ env.LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST,+ };++ // Only the org allowlist enables the gateway in these tests.+ beforeEach(() => {+ Object.assign(env, {+ NODE_ENV: "test",+ LANGFUSE_AI_GATEWAY_ENABLED: "false",+ NEXT_PUBLIC_PREVIEW_PR_URL: undefined,+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST: [],+ });+ });++ afterEach(() => {+ Object.assign(env, originalGatewayAvailability);+ });++ it("rejects creating an AI_GATEWAY user via POST while the AI Gateway is off", async () => {+ const email = `${randomUUID()}@example.com`;+ createdEmails.push(email);++ const status = await call(scimUsersRoute, "POST", {+ schemas: ["urn:ietf:params:scim:schemas:core:2.0:User"],+ userName: email,+ roles: ["AI_GATEWAY"],+ });++ expect(status).toBe(403);+ expect(+ await prisma.organizationMembership.count({+ where: { orgId, user: { email } },+ }),+ ).toBe(0);+ });++ it("rejects moving a member to AI_GATEWAY via PUT while the AI Gateway is off", async () => {+ expect(await putUser(memberId, ["AI_GATEWAY"])).toBe(403);++ expect(await roleOf(memberId)).toBe("MEMBER");+ });++ it("keeps an existing AI_GATEWAY member through a sync while the AI Gateway is off", async () => {+ await prisma.organizationMembership.update({+ where: { orgId_userId: { orgId, userId: memberId } },+ data: { role: "AI_GATEWAY" },+ });++ expect(await putUser(memberId, ["AI_GATEWAY"])).toBe(200);++ expect(await roleOf(memberId)).toBe("AI_GATEWAY");+ });++ it("moves a member to AI_GATEWAY via PUT while the AI Gateway is on for the org", async () => {+ Object.assign(env, {+ LANGFUSE_AI_GATEWAY_ORGANIZATION_ID_ALLOWLIST: [orgId],+ });++ expect(await putUser(memberId, ["AI_GATEWAY"])).toBe(200);++ expect(await roleOf(memberId)).toBe("AI_GATEWAY");+ });+ });});diff --git a/web/src/__tests__/server/unit/redirectGatewayOnlyLanding.servertest.ts b/web/src/__tests__/server/unit/redirectGatewayOnlyLanding.servertest.tsnew file mode 100644index 0000000000..531c6cff55--- /dev/null+++ b/web/src/__tests__/server/unit/redirectGatewayOnlyLanding.servertest.ts@@ -0,0 +1,87 @@+import { type GetServerSidePropsContext } from "next";+import { type Session } from "next-auth";++import { redirectGatewayOnlyLanding } from "@/src/features/organizations/server/redirectGatewayOnlyLanding";+import { getServerAuthSession } from "@/src/server/auth";++vi.mock("@/src/server/auth", () => ({ getServerAuthSession: vi.fn() }));++describe("redirectGatewayOnlyLanding", () => {+ it("sends gateway-only members to their organization settings", async () => {+ mockSession([gatewayOrg({ aiGateway: true })]);++ expect(await landOn({ organizationId: "gateway-org" })).toEqual({+ redirect: {+ destination: "/organization/gateway-org/settings",+ permanent: false,+ },+ });+ });++ it("sends members whose only org is gateway-only to its settings", async () => {+ mockSession([gatewayOrg({ aiGateway: true })]);++ expect(await landOn({})).toEqual({+ redirect: {+ destination: "/organization/gateway-org/settings",+ permanent: false,+ },+ });+ });++ it("keeps gateway-only members on the page when the AI Gateway is off for their org", async () => {+ mockSession([gatewayOrg({ aiGateway: false })]);++ expect(await landOn({ organizationId: "gateway-org" })).toEqual({+ props: {},+ });+ });++ it("keeps members who can read the org settings on the page", async () => {+ mockSession([{ ...gatewayOrg({ aiGateway: true }), role: "MEMBER" }]);++ expect(await landOn({ organizationId: "gateway-org" })).toEqual({+ props: {},+ });+ });++ it("keeps users with several orgs on the overview", async () => {+ mockSession([+ gatewayOrg({ aiGateway: true }),+ { ...gatewayOrg({ aiGateway: true }), id: "other-org" },+ ]);++ expect(await landOn({})).toEqual({ props: {} });+ });+});++/** landOn runs the redirect for a request with the given query */+function landOn(query: Record<string, string>) {+ return redirectGatewayOnlyLanding({+ req: {},+ res: {},+ query,+ } as unknown as GetServerSidePropsContext);+}++/** mockSession signs in a user who belongs to the given orgs */+function mockSession(organizations: Organization[]) {+ vi.mocked(getServerAuthSession).mockResolvedValue({+ expires: "",+ user: { id: "user-1", admin: false, organizations },+ } as unknown as Session);+}++/** gatewayOrg is an org where the user holds the AI_GATEWAY role and sees no projects */+function gatewayOrg(featureFlags: { aiGateway: boolean }) {+ return {+ id: "gateway-org",+ name: "Gateway Org",+ role: "AI_GATEWAY",+ plan: "oss",+ projects: [],+ featureFlags,+ } as unknown as Organization;+}++type Organization = NonNullable<Session["user"]>["organizations"][number];diff --git a/web/src/__tests__/server/unit/resolveProjectRole.servertest.ts b/web/src/__tests__/server/unit/resolveProjectRole.servertest.tsnew file mode 100644index 0000000000..09c9c4641a--- /dev/null+++ b/web/src/__tests__/server/unit/resolveProjectRole.servertest.ts@@ -0,0 +1,47 @@+import { describe, expect, it } from "vitest";++import { Role, type ProjectMembership } from "@langfuse/shared/src/db";+import { resolveProjectRole } from "@langfuse/shared/src/server";++const projectId = "project-1";++const projectMembership = (role: Role): ProjectMembership => ({+ projectId,+ userId: "user-1",+ orgMembershipId: "org-membership-1",+ role,+ createdAt: new Date(),+ updatedAt: new Date(),+});++describe("resolveProjectRole", () => {+ it("uses the project role over the org role", () => {+ expect(+ resolveProjectRole({+ projectId,+ projectMemberships: [projectMembership(Role.ADMIN)],+ orgMembershipRole: Role.VIEWER,+ }),+ ).toBe(Role.ADMIN);+ });++ it("falls back to the org role without a project membership", () => {+ expect(+ resolveProjectRole({+ projectId,+ projectMemberships: [],+ orgMembershipRole: Role.MEMBER,+ }),+ ).toBe(Role.MEMBER);+ });++ it("honors project roles of AI_GATEWAY org members", () => {+ expect(+ resolveProjectRole({+ projectId,+ projectMemberships: [projectMembership(Role.ADMIN)],+ orgMembershipRole: Role.AI_GATEWAY,+ }),+ ).toBe(Role.ADMIN);+ });+});diff --git a/web/src/__tests__/server/unit/systemRoleAccessRights.servertest.ts b/web/src/__tests__/server/unit/systemRoleAccessRights.servertest.tsindex e53dc73032..47eafec3e6 100644--- a/web/src/__tests__/server/unit/systemRoleAccessRights.servertest.ts+++ b/web/src/__tests__/server/unit/systemRoleAccessRights.servertest.ts@@ -103,16 +103,33 @@ describe("systemRoleAccessRights", () => {]);});- it("grants AI_GATEWAY exactly gateway:invoke at org scope", () => {+ it("grants AI_GATEWAY exactly gateway:read and gateway:invoke at org scope", () => {expect(systemRoleAccessRights.AI_GATEWAY.policies).toEqual([{resourceKind: "organization",effect: "ALLOW",- actions: ["gateway:invoke"],+ actions: ["gateway:read", "gateway:invoke"],},]);});+ it("grants the AI_GATEWAY membership role the AI_GATEWAY system role's access", () => {+ expect(organizationRoleAccessRights.AI_GATEWAY).toEqual([+ "gateway:read",+ "gateway:invoke",+ ]);+ expect(projectRoleAccessRights.AI_GATEWAY).toEqual([]);+ });++ it.each(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE"] as const)(+ "grants %s organizationSettings:read",+ (role) => {+ expect(organizationRoleAccessRights[role]).toContain(+ "organizationSettings:read",+ );+ },+ );+it.each(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE"] as const)("derives %s policies from the org and project access-right tables",(role) => {@@ -148,7 +165,7 @@ describe("systemRoleAccessRights", () => {it("tags api-key roles and user roles disjointly", () => {const tagsFor = (role: keyof typeof systemRoleAccessRights) =>systemRoleAccessRights[role].tags;- for (const role of ["SCORES_INGEST", "INGEST", "AI_GATEWAY"] as const) {+ for (const role of ["SCORES_INGEST", "INGEST"] as const) {expect(tagsFor(role)).toEqual(["principal:apiKey"]);}for (const role of [@@ -163,6 +180,7 @@ describe("systemRoleAccessRights", () => {"MEMBER","VIEWER","NONE",+ "AI_GATEWAY",] as const) {expect(tagsFor(role)).toContain("principal:user");}diff --git a/web/src/components/PagedSettingsContainer.tsx b/web/src/components/PagedSettingsContainer.tsxindex dd3c0396d0..12958c6c8c 100644--- a/web/src/components/PagedSettingsContainer.tsx+++ b/web/src/components/PagedSettingsContainer.tsx@@ -52,9 +52,7 @@ export const PagedSettingsContainer = ({sectionBadges = {},}: SettingsProps) => {const router = useRouter();- const availablePages = pages.filter((page) =>- typeof page.show === "function" ? page.show() : (page.show ?? true),- );+ const availablePages = pages.filter(isSettingsPageShown);const contentPages = availablePages.filter((page) => "content" in page);const enabledContentPages = contentPages.filter(@@ -285,3 +283,9 @@ function groupPagesBySection<T extends { section?: string }>(pages: T[]) {[],);}++/** isSettingsPageShown resolves a page's show flag, defaulting to shown */+export function isSettingsPageShown(page: Pick<SettingsPage, "show">) {+ if (typeof page.show === "function") return page.show();+ return page.show ?? true;+}diff --git a/web/src/components/layouts/app-layout/utils/navigationFilters.clienttest.ts b/web/src/components/layouts/app-layout/utils/navigationFilters.clienttest.tsindex 7eef008a29..eb245064bd 100644--- a/web/src/components/layouts/app-layout/utils/navigationFilters.clienttest.ts+++ b/web/src/components/layouts/app-layout/utils/navigationFilters.clienttest.ts@@ -111,3 +111,43 @@ it.each([);},);++it.each([+ { role: "AI_GATEWAY", projects: [], visible: false },+ { role: "AI_GATEWAY", projects: [{ id: "project-1" }], visible: true },+ { role: "NONE", projects: [], visible: true },+])(+ "shows Projects to $role members with $projects.length projects: $visible",+ ({ role, projects, visible }) => {+ const route = ROUTES.find((route) => route.title === "Projects")!;+ const organization = {+ id: "org-1",+ role,+ projects,+ } as unknown as NonNullable<Session["user"]>["organizations"][number];+ const context: NavigationFilterContext = {+ routerProjectId: undefined,+ routerOrganizationId: "org-1",+ session: {+ user: {+ admin: false,+ featureFlags: testFeatureFlags({}),+ organizations: [organization],+ },+ } as Session,+ enableExperimentalFeatures: false,+ internalFeaturesEnabled: false,+ cloudAdmin: false,+ entitlements: [],+ uiCustomization: null,+ isLangfuseCloud: false,+ hasActiveCloudIncident: false,+ forceV3Experience: false,+ currentPath: "/organization/org-1",+ };++ expect(applyNavigationFilters([route], context, organization)).toEqual(+ visible ? [route] : [],+ );+ },+);diff --git a/web/src/components/layouts/routes.tsx b/web/src/components/layouts/routes.tsxindex 7377fb4291..ed3b42c6cd 100644--- a/web/src/components/layouts/routes.tsx+++ b/web/src/components/layouts/routes.tsx@@ -26,7 +26,10 @@ import {import { type ReactNode } from "react";import { type Entitlement } from "@/src/features/entitlements/constants/entitlements";import { type Session } from "next-auth";-import { type OrganizationScope } from "@/src/features/rbac";+import {+ hasOrganizationAccess,+ type OrganizationScope,+} from "@/src/features/rbac";import { SupportButton } from "@/src/components/nav/SupportButton";import { V4SidebarToggle } from "@/src/features/events";import { BookACallButton } from "@/src/components/nav/BookACallButton";@@ -107,6 +110,13 @@ export const ROUTES: Route[] = [title: "Projects",href: "/organization/[organizationId]",icon: Grid2X2,+ show: ({ organization }) =>+ !organization ||+ hasOrganizationAccess({+ role: organization.role,+ scope: "organizationSettings:read",+ }) ||+ organization.projects.length > 0,section: RouteSection.Main,},{diff --git a/web/src/ee/features/admin-api/server/memberships.ts b/web/src/ee/features/admin-api/server/memberships.tsindex bce82ddb4b..d58cc619a4 100644--- a/web/src/ee/features/admin-api/server/memberships.ts+++ b/web/src/ee/features/admin-api/server/memberships.ts@@ -7,6 +7,7 @@ import {deleteUserBoundApiKeysForRole,evictRevokedApiKeys,} from "@/src/features/ai-gateway/server/apiKey/userBoundApiKeys";+import { requireGatewayEnabledForRole } from "@/src/features/ai-gateway/server/availability";import { auditLog } from "@/src/features/audit-logs/server";import { type AuthorizationContext } from "@/src/features/auth/policy/types";import { authorize } from "@/src/features/rbac/authorize";@@ -97,6 +98,9 @@ export async function handleUpdateMembership(from: before?.role,to: validatedBody.data.role,});+ if (before?.role !== validatedBody.data.role) {+ requireGatewayEnabledForRole(orgId, validatedBody.data.role);+ }const after = await tx.organizationMembership.upsert({where: { orgId_userId: { orgId, userId: validatedBody.data.userId } },update: { role: validatedBody.data.role },diff --git a/web/src/ee/features/admin-api/server/projects/projectById/memberships/index.ts b/web/src/ee/features/admin-api/server/projects/projectById/memberships/index.tsindex aa29528f15..b1b9bd88f6 100644--- a/web/src/ee/features/admin-api/server/projects/projectById/memberships/index.ts+++ b/web/src/ee/features/admin-api/server/projects/projectById/memberships/index.ts@@ -15,7 +15,7 @@ import {// Schema for request body validationconst MembershipSchema = z.object({userId: z.string(),- role: z.enum(Role),+ role: z.enum(Role).exclude([Role.AI_GATEWAY]),});// Schema for delete request body validationdiff --git a/web/src/ee/features/sfdc-sync/server/sfdcService.ts b/web/src/ee/features/sfdc-sync/server/sfdcService.tsindex 7fede55fa9..ad6109d4f7 100644--- a/web/src/ee/features/sfdc-sync/server/sfdcService.ts+++ b/web/src/ee/features/sfdc-sync/server/sfdcService.ts@@ -53,7 +53,14 @@ import {* never sent as a role — `setUserRole` syncs it as a removal instead, since* a NONE member must hold no org-member bridge in SFDC.*/-const LangfuseRole = z.enum(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE"]);+const LangfuseRole = z.enum([+ "OWNER",+ "ADMIN",+ "MEMBER",+ "VIEWER",+ "NONE",+ "AI_GATEWAY",+]);type LangfuseRole = z.infer<typeof LangfuseRole>;// The SFDC org-member role picklist allows only ADMIN and DEVELOPER.@@ -62,6 +69,7 @@ const LANGFUSE_TO_SFDC_ROLE = {ADMIN: "ADMIN",MEMBER: "DEVELOPER",VIEWER: "DEVELOPER",+ AI_GATEWAY: "DEVELOPER",} as const;/**diff --git a/web/src/features/ai-gateway/server/availability.ts b/web/src/features/ai-gateway/server/availability.tsindex 79d949841a..80f9a497f7 100644--- a/web/src/features/ai-gateway/server/availability.ts+++ b/web/src/features/ai-gateway/server/availability.ts@@ -1,4 +1,4 @@-import { ForbiddenError } from "@langfuse/shared";+import { ForbiddenError, Role } from "@langfuse/shared";import { env } from "@/src/env.mjs";@@ -82,3 +82,12 @@ export const requireGatewayEnabledForOrganization = (throw new ForbiddenError("AI Gateway is not enabled for this organization");}};++/** requireGatewayEnabledForRole rejects granting the AI_GATEWAY role while the AI Gateway is off for the org */+export const requireGatewayEnabledForRole = (+ organizationId: string,+ role: Role,+): void => {+ if (role !== Role.AI_GATEWAY) return;+ requireGatewayEnabledForOrganization(organizationId);+};diff --git a/web/src/features/ai-gateway/server/router.ts b/web/src/features/ai-gateway/server/router.tsindex 2cd0e085c6..d9cfa72d8c 100644--- a/web/src/features/ai-gateway/server/router.ts+++ b/web/src/features/ai-gateway/server/router.ts@@ -132,11 +132,18 @@ export const aiGatewayRouter = createTRPCRouter({};}),- /** Readable by every gateway reader; exposes only whether setup is done, not the config itself. */+ /** Readable by every gateway reader and key owner; exposes only whether setup is done, not the config itself. */getSetupStatus: protectedOrganizationProcedure.input(organizationInput).query(async ({ input, ctx }) => {- requireGatewayRead({ session: ctx.session, orgId: input.orgId });+ const canInvokeGateway = hasOrganizationAccess({+ session: ctx.session,+ organizationId: input.orgId,+ scope: "gateway:invoke",+ });+ if (canInvokeGateway)+ requireGatewayInvoke({ session: ctx.session, orgId: input.orgId });+ else requireGatewayRead({ session: ctx.session, orgId: input.orgId });return new GatewayConfigService(ctx.prisma).getSetupStatus(input.orgId);}),diff --git a/web/src/features/organizations/OrganizationSettingsPage.tsx b/web/src/features/organizations/OrganizationSettingsPage.tsxindex 1d259528b3..aaa475bfe7 100644--- a/web/src/features/organizations/OrganizationSettingsPage.tsx+++ b/web/src/features/organizations/OrganizationSettingsPage.tsx@@ -60,7 +60,11 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {scope: "organization:CRUD_apiKeys",});const showOrgApiKeySettings = hasAdminApiEntitlement && hasOrgApiKeyAccess;- const showAuditLogs = useHasEntitlement("audit-logs");+ const hasAuditLogsEntitlement = useHasEntitlement("audit-logs");+ const canReadSettings = useHasOrganizationAccess({+ organizationId: organization?.id,+ scope: "organizationSettings:read",+ });const canUpdateOrganization = useHasOrganizationAccess({organizationId: organization?.id,scope: "organization:update",@@ -82,7 +86,8 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {if (!organization) return [];- const showBillingPage = showBillingSettings && isCloudBillingAvailable;+ const showBillingPage =+ showBillingSettings && isCloudBillingAvailable && canReadSettings;return getOrganizationSettingsPages({organization,@@ -91,9 +96,12 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {// covers deployments without one (self-hosted).showUsageSettings: canReadUsage && !showBillingPage,showOrgApiKeySettings,- showAuditLogs,- isLangfuseCloud,- showV4Migration,+ showAuditLogs: hasAuditLogsEntitlement && canReadSettings,+ showSsoSettings: isLangfuseCloud && canReadSettings,+ showV4Migration: showV4Migration && canReadSettings,+ showGeneralSettings: canReadSettings,+ showMembers: canReadSettings,+ showProjects: canReadSettings || organization.projects.length > 0,showAiGatewayManagement: gatewayAccess.showManagement,showAiGatewayNotDeployedNotice: gatewayAccess.showNotDeployedNotice,showAiGatewayModels: gatewayAccess.showModels,@@ -117,8 +125,11 @@ const getOrganizationSettingsPages = ({showUsageSettings,showOrgApiKeySettings,showAuditLogs,- isLangfuseCloud,+ showSsoSettings,showV4Migration,+ showGeneralSettings,+ showMembers,+ showProjects,showAiGatewayManagement,showAiGatewayNotDeployedNotice,showAiGatewayModels,@@ -143,8 +154,11 @@ const getOrganizationSettingsPages = ({showUsageSettings: boolean;showOrgApiKeySettings: boolean;showAuditLogs: boolean;- isLangfuseCloud: boolean;+ showSsoSettings: boolean;showV4Migration: boolean;+ showGeneralSettings: boolean;+ showMembers: boolean;+ showProjects: boolean;showAiGatewayManagement: boolean;showAiGatewayNotDeployedNotice: boolean;showAiGatewayModels: boolean;@@ -208,6 +222,7 @@ const getOrganizationSettingsPages = ({/></div>),+ show: showGeneralSettings,},{title: "Feature Previews",@@ -267,6 +282,7 @@ const getOrganizationSettingsPages = ({section: "Organization",cmdKKeywords: ["invite", "user", "rbac"],content: <OrganizationMembersSettings orgId={organization.id} />,+ show: showMembers,},{title: "Audit Logs",@@ -314,13 +330,14 @@ const getOrganizationSettingsPages = ({"verify",],content: <SSOSettings orgId={organization.id} />,- show: isLangfuseCloud,+ show: showSsoSettings,},{title: "Projects",slug: "projects",section: "Organization",href: `/organization/${organization.id}`,+ show: showProjects,},{title: "v4 Migration",diff --git a/web/src/features/organizations/components/OrganizationProjectOverview.tsx b/web/src/features/organizations/components/OrganizationProjectOverview.tsxindex 57200b9bef..18eb95024f 100644--- a/web/src/features/organizations/components/OrganizationProjectOverview.tsx+++ b/web/src/features/organizations/components/OrganizationProjectOverview.tsx@@ -55,6 +55,7 @@ import { useGatewayKeyReminder } from "@/src/features/ai-gateway/hooks/useGatewaimport { useGatewayLaunchTarget } from "@/src/features/ai-gateway/hooks/useGatewayLaunchEligibility";import { useGatewaySettingsAccess } from "@/src/features/ai-gateway/hooks/useGatewaySettingsAccess";import { getContextualFeatureFlags } from "@/src/features/feature-flags/utils";+import { gatewayOnlyLanding } from "@/src/features/organizations/utils/gatewayOnlyLanding";const lastTraceLabel = (lastTraceAt: Date | string | null | undefined) =>lastTraceAt@@ -375,11 +376,70 @@ const SingleOrganizationProjectOverviewTile = ({/>}/>- <OrganizationProjectTiles org={org} search={search} />+ <OrganizationProjects org={org} search={search} /></div>);};+/** OrganizationProjects lists the org's projects, or points to its settings when the user has none */+const OrganizationProjects = ({+ org,+ search,+}: {+ org: Organization;+ search?: string;+}) => {+ if (org.projects.length === 0) {+ return <OrganizationSettingsTile orgId={org.id} />;+ }+ return <OrganizationProjectTiles org={org} search={search} />;+};++/** OrganizationSettingsTile links to the org's settings, and to project creation when allowed */+const OrganizationSettingsTile = ({ orgId }: { orgId: string }) => {+ const canCreateProject = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "projects:create",+ });++ return (+ <Card>+ <CardHeader>+ <CardTitle className="text-base">No projects</CardTitle>+ <CardDescription>+ <NoProjectsDescription canCreateProject={canCreateProject} />+ </CardDescription>+ </CardHeader>+ <CardFooter className="gap-2">+ {canCreateProject && (+ <Button asChild>+ <Link href={createProjectRoute(orgId)}>+ <PlusIcon size="base" __rawClassName="mr-2" aria-hidden="true" />+ New project+ </Link>+ </Button>+ )}+ <Button asChild variant="secondary">+ <Link href={`/organization/${orgId}/settings`}>+ <Settings size="base" __rawClassName="mr-2" aria-hidden="true" />+ Organization settings+ </Link>+ </Button>+ </CardFooter>+ </Card>+ );+};++/** NoProjectsDescription explains an empty project list by whether the user can create projects */+const NoProjectsDescription = ({+ canCreateProject,+}: {+ canCreateProject: boolean;+}) => {+ if (canCreateProject) return <>This organization has no projects yet.</>;+ return <>You don't have access to any projects in this organization.</>;+};+export const OrganizationProjectOverview = () => {const router = useRouter();const queryOrgId = router.query.organizationId;@@ -389,6 +449,7 @@ export const OrganizationProjectOverview = () => {const organizations = session.data?.user?.organizations;const [{ search }, setQueryParams] = useQueryParams({ search: StringParam });const v4MigrationBannerState = useV4MigrationBannerState(v4UpgradeUiEnabled);+ const landing = gatewayOnlyLanding(session.data, queryOrgId);const gatewayLaunchCandidates = (organizations ?? []).filter((org) =>@@ -414,6 +475,15 @@ export const OrganizationProjectOverview = () => {const gatewayLaunchTarget = useGatewayLaunchTarget(gatewayLaunchCandidates);const userId = session.data?.user?.id;+ if (landing && !landing.canUseGateway) {+ return (+ <ErrorPage+ title="No access to this organization"+ message="AI Gateway is not enabled for this organization. Ask an organization admin to change your role."+ />+ );+ }+if (organizations === undefined) {return "loading...";}@@ -589,3 +659,5 @@ const Onboarding = () => {</Card>);};++type Organization = NonNullable<Session["user"]>["organizations"][number];diff --git a/web/src/features/organizations/server/redirectGatewayOnlyLanding.ts b/web/src/features/organizations/server/redirectGatewayOnlyLanding.tsnew file mode 100644index 0000000000..d570e6722d--- /dev/null+++ b/web/src/features/organizations/server/redirectGatewayOnlyLanding.ts@@ -0,0 +1,17 @@+import { type GetServerSideProps } from "next";++import { gatewayOnlyLanding } from "@/src/features/organizations/utils/gatewayOnlyLanding";+import { getServerAuthSession } from "@/src/server/auth";++/** redirectGatewayOnlyLanding sends members who can only use the AI Gateway to their org settings */+export const redirectGatewayOnlyLanding: GetServerSideProps = async (ctx) => {+ const session = await getServerAuthSession({ req: ctx.req, res: ctx.res });+ const landing = gatewayOnlyLanding(session, ctx.query.organizationId);+ if (!landing?.canUseGateway) return { props: {} };+ return {+ redirect: {+ destination: `/organization/${encodeURIComponent(landing.organizationId)}/settings`,+ permanent: false,+ },+ };+};diff --git a/web/src/features/organizations/utils/gatewayOnlyLanding.ts b/web/src/features/organizations/utils/gatewayOnlyLanding.tsnew file mode 100644index 0000000000..328a164ce5--- /dev/null+++ b/web/src/features/organizations/utils/gatewayOnlyLanding.ts@@ -0,0 +1,61 @@+import { type Session } from "next-auth";++import { getContextualFeatureFlags } from "@/src/features/feature-flags/utils";+import { hasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";++/** gatewayOnlyLanding finds the landing org whose projects the user cannot see */+export function gatewayOnlyLanding(+ session: Session | null,+ queryOrgId: string | string[] | undefined,+): GatewayOnlyLanding | undefined {+ const org = landingOrganization(+ queryOrgId,+ session?.user?.organizations ?? [],+ );+ if (!org || canViewOrganizationProjects(session, org)) return undefined;+ return {+ organizationId: org.id,+ canUseGateway: canUseGateway(session, org.id),+ };+}++/** landingOrganization picks the org requested in the URL, or the user's only org */+function landingOrganization(+ queryOrgId: string | string[] | undefined,+ organizations: Organization[],+) {+ if (queryOrgId) return organizations.find((org) => org.id === queryOrgId);+ if (organizations.length === 1) return organizations[0];+ return undefined;+}++/** canViewOrganizationProjects is true when the user can read the org settings or any of its projects */+function canViewOrganizationProjects(+ session: Session | null,+ org: Organization,+) {+ return (+ hasOrganizationAccess({+ session,+ organizationId: org.id,+ scope: "organizationSettings:read",+ }) || org.projects.length > 0+ );+}++/** canUseGateway reports whether the user can invoke the AI Gateway in the given org */+function canUseGateway(session: Session | null, organizationId: string) {+ return (+ getContextualFeatureFlags(session?.user, { organizationId })?.aiGateway ===+ true &&+ hasOrganizationAccess({+ session,+ organizationId,+ scope: "gateway:invoke",+ })+ );+}++type GatewayOnlyLanding = { organizationId: string; canUseGateway: boolean };++type Organization = NonNullable<Session["user"]>["organizations"][number];diff --git a/web/src/features/prompts/server/utils/authorizeProtectedLabelMutation.ts b/web/src/features/prompts/server/utils/authorizeProtectedLabelMutation.tsindex 0a80fa837b..11ceed0676 100644--- a/web/src/features/prompts/server/utils/authorizeProtectedLabelMutation.ts+++ b/web/src/features/prompts/server/utils/authorizeProtectedLabelMutation.ts@@ -63,7 +63,7 @@ async function resolveApiKeyCreatorProjectAccess(params: {const projectRole = projectMembership?.role ?? orgMembership.role;- if (projectRole === Role.NONE) {+ if (!hasProjectAccessByRole({ role: projectRole, scope: "project:read" })) {return null;}diff --git a/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx b/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsxindex cc47c5f2d8..0bcec3021a 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx@@ -12,6 +12,7 @@ const defaultArgs = {hasProjectRoleEntitlement: false,canManageOrgOwnership: true,canManageProjectOwnership: true,+ isAiGatewayEnabled: true,isPending: false,createProjectMember: fn().mockResolvedValue(undefined),onSuccess: fn(),@@ -102,3 +103,34 @@ export const SubmitsInvitation = meta.story({await expect(args.onSuccess).toHaveBeenCalledOnce();},});++export const AiGatewayDisabled = meta.story({+ name: "(Test) Hides the AI Gateway role when the gateway is off",+ args: { ...defaultArgs, isAiGatewayEnabled: false },+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(body.getAllByRole("combobox")[0]!);++ await expect(+ await body.findByRole("option", { name: /Member/ }),+ ).toBeInTheDocument();+ await expect(+ body.queryByRole("option", { name: /AI Gateway/ }),+ ).not.toBeInTheDocument();+ },+});++export const AiGatewayEnabled = meta.story({+ name: "(Test) Offers the AI Gateway role when the gateway is on",+ args: defaultArgs,+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(body.getAllByRole("combobox")[0]!);++ await expect(+ await body.findByRole("option", { name: /AI Gateway/ }),+ ).toBeInTheDocument();+ },+});diff --git a/web/src/features/rbac/components/CreateProjectMemberDialog.tsx b/web/src/features/rbac/components/CreateProjectMemberDialog.tsxindex 943caba35a..2725556d20 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialog.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialog.tsx@@ -23,13 +23,14 @@ const roleValues = {ADMIN: "ADMIN",MEMBER: "MEMBER",VIEWER: "VIEWER",+ AI_GATEWAY: "AI_GATEWAY",NONE: "NONE",} as const satisfies Record<Role, Role>;const formSchema = z.object({email: z.string().trim().pipe(z.email()),orgRole: z.enum(roleValues),- projectRole: z.enum(roleValues),+ projectRole: z.enum(roleValues).exclude([roleValues.AI_GATEWAY]),});type FormValues = z.infer<typeof formSchema>;@@ -40,6 +41,7 @@ type CreateProjectMemberDialogProps = {hasProjectRoleEntitlement: boolean;canManageOrgOwnership: boolean;canManageProjectOwnership: boolean;+ isAiGatewayEnabled: boolean;isPending: boolean;createProjectMember: (values: FormValues) => Promise<void>;onSuccess: () => void;@@ -51,6 +53,7 @@ export function CreateProjectMemberDialog({hasProjectRoleEntitlement,canManageOrgOwnership,canManageProjectOwnership,+ isAiGatewayEnabled,isPending,createProjectMember,onSuccess,@@ -124,7 +127,10 @@ export function CreateProjectMemberDialog({<FormItem><FormLabel>Organization Role</FormLabel><RoleSelect- roles={Object.values(roleValues)}+ roles={Object.values(roleValues).filter(+ (role) =>+ isAiGatewayEnabled || role !== roleValues.AI_GATEWAY,+ )}canManageOwnership={canManageOrgOwnership}value={field.value}onValueChange={field.onChange}@@ -146,8 +152,9 @@ export function CreateProjectMemberDialog({canManageOwnership={canManageProjectOwnership}roles={Object.values(roleValues).filter((role) =>- !hasOnlySingleProjectAccess ||- role !== roleValues.NONE,+ role !== roleValues.AI_GATEWAY &&+ (!hasOnlySingleProjectAccess ||+ role !== roleValues.NONE),)}value={field.value}onValueChange={field.onChange}diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsxindex 24cf30ccc9..e5ef618797 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx@@ -6,6 +6,7 @@ import {useEntitlementLimit,useHasEntitlement,} from "@/src/features/entitlements";+import { useIsFeatureEnabled } from "@/src/features/feature-flags";import { usePostHogClientCapture } from "@/src/features/posthog-analytics";import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";@@ -52,6 +53,10 @@ export function CreateProjectMemberDialogController({scope: "projectMembers:manageOwnership",}) || canManageOrgOwnership;const hasProjectRoleEntitlement = useHasEntitlement("rbac-project-roles");+ const isAiGatewayEnabled = useIsFeatureEnabled("aiGateway", {+ enableForAdmins: false,+ organizationId: orgId,+ });const hasOnlySingleProjectAccess =!hasOrgAccess && hasProjectAccess && hasProjectRoleEntitlement;const hasAccess = hasOrgAccess || hasOnlySingleProjectAccess;@@ -102,6 +107,7 @@ export function CreateProjectMemberDialogController({hasProjectRoleEntitlement={hasProjectRoleEntitlement}canManageOrgOwnership={canManageOrgOwnership}canManageProjectOwnership={canManageProjectOwnership}+ isAiGatewayEnabled={isAiGatewayEnabled}isPending={createProjectMemberMutation.isPending}createProjectMember={(values) => {capture(diff --git a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsxindex 83957c6cc9..bb41f4d2c1 100644--- a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx@@ -14,6 +14,7 @@ import { type AsyncTableData } from "@/src/components/design-system/table/Table"import useSessionStorage from "@/src/components/useSessionStorage";import { env } from "@/src/env.mjs";import { useHasEntitlement } from "@/src/features/entitlements";+import { useIsFeatureEnabled } from "@/src/features/feature-flags";import { showSuccessToast } from "@/src/features/notifications";import { CreateProjectMemberDialogController } from "@/src/features/rbac/components/CreateProjectMemberDialogController";import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";@@ -64,6 +65,11 @@ export function ConnectedMembersSettingsTable({scope: "organizationMembers:manageOwnership",});+ const isAiGatewayEnabled = useIsFeatureEnabled("aiGateway", {+ enableForAdmins: false,+ organizationId: orgId,+ });+// Org owners outrank any project role override they hold.const canManageProjectOwnership =useHasProjectAccess({@@ -231,6 +237,7 @@ export function ConnectedMembersSettingsTable({hasProjectCudAccess={hasProjectCudAccess}canManageOrgOwnership={canManageOrgOwnership}canManageProjectOwnership={canManageProjectOwnership}+ isAiGatewayEnabled={isAiGatewayEnabled}projectRolesEntitlement={projectRolesEntitlement}showFeaturePreviews={!project && hasOrgCudAccess && orgId !== env.NEXT_PUBLIC_DEMO_ORG_ID@@ -279,7 +286,7 @@ export function ConnectedMembersSettingsTable({);}}onUpdateProjectRole={(member, projectRole) => {- if (!project) return;+ if (!project || projectRole === "AI_GATEWAY") return;if (member.meta.userId === session.data?.user?.id &&!confirm(diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsxindex 4d691d3bb4..a60eaa337c 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx@@ -68,6 +68,7 @@ export const Default = meta.story({hasProjectCudAccess: false,canManageOrgOwnership: true,canManageProjectOwnership: true,+ isAiGatewayEnabled: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),@@ -129,6 +130,7 @@ export const FilteredByRole = meta.story({hasProjectCudAccess: false,canManageOrgOwnership: true,canManageProjectOwnership: true,+ isAiGatewayEnabled: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),@@ -161,6 +163,7 @@ export const Loading = meta.story({hasProjectCudAccess: false,canManageOrgOwnership: true,canManageProjectOwnership: true,+ isAiGatewayEnabled: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsxindex ee0af9eb5a..6d20cabe0d 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx@@ -2,6 +2,7 @@import { useCallback, useMemo } from "react";import { Trash } from "@langfuse/icons";import { type Role } from "@langfuse/shared";+import { systemRoleAccessRights } from "@langfuse/shared/rbac";import { type TableProps } from "@/src/components/design-system/table/Table";import { type PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";@@ -25,11 +26,12 @@ import Link from "next/link";import { Popover, PopoverTrigger } from "@/src/components/ui/popover";import { Button } from "@/src/components/ui/button";-const formatRoleLabel = (role: Role) =>- role.charAt(0).toUpperCase() + role.slice(1).toLowerCase();+const formatRoleLabel = (role: Role) => systemRoleAccessRights[role].name;const allRoles = Object.keys(orderedRoles) as Role[];+const allProjectRoles = allRoles.filter((role) => role !== "AI_GATEWAY");+const ownerLockedLabel = "Requires owner access";const roleFilterOptions = allRoles@@ -61,6 +63,7 @@ type MembersSettingsTableProps = Pick<hasProjectCudAccess: boolean;canManageOrgOwnership: boolean;canManageProjectOwnership: boolean;+ isAiGatewayEnabled: boolean;projectRolesEntitlement: boolean;showFeaturePreviews: boolean;updatingOrgRoleMembershipIds: ReadonlySet<string>;@@ -88,6 +91,7 @@ export function MembersSettingsTable({hasProjectCudAccess,canManageOrgOwnership,canManageProjectOwnership,+ isAiGatewayEnabled,projectRolesEntitlement,showFeaturePreviews,updatingOrgRoleMembershipIds,@@ -132,7 +136,9 @@ export function MembersSettingsTable({row.original.orgRole === "OWNER" && !canManageOrgOwnership;const select = (<RoleSelect- roles={allRoles}+ roles={allRoles.filter(+ (role) => isAiGatewayEnabled || role !== "AI_GATEWAY",+ )}canManageOwnership={canManageOrgOwnership}value={row.original.orgRole}size="compact"@@ -211,7 +217,7 @@ export function MembersSettingsTable({(row.original.orgRole === "OWNER" && !canManageOrgOwnership);const select = (<RoleSelect- roles={allRoles}+ roles={allProjectRoles}canManageOwnership={canManageProjectOwnership}value={row.original.projectRole ?? "NONE"}isProjectRole@@ -291,6 +297,7 @@ export function MembersSettingsTable({canManageProjectOwnership,hasOrgCudAccess,hasProjectCudAccess,+ isAiGatewayEnabled,onUpdateOrgRole,onUpdateProjectRole,orgId,diff --git a/web/src/features/rbac/constants/orderedRoles.ts b/web/src/features/rbac/constants/orderedRoles.tsindex 0516c188de..aa2c5d656c 100644--- a/web/src/features/rbac/constants/orderedRoles.ts+++ b/web/src/features/rbac/constants/orderedRoles.ts@@ -1,9 +1,10 @@import { type Role } from "@langfuse/shared/src/db";export const orderedRoles: Record<Role, number> = {- OWNER: 4,- ADMIN: 3,- MEMBER: 2,- VIEWER: 1,+ OWNER: 5,+ ADMIN: 4,+ MEMBER: 3,+ VIEWER: 2,+ AI_GATEWAY: 1,NONE: 0,};diff --git a/web/src/features/rbac/server/allInvitesRoutes.ts b/web/src/features/rbac/server/allInvitesRoutes.tsindex f306629e86..896215c552 100644--- a/web/src/features/rbac/server/allInvitesRoutes.ts+++ b/web/src/features/rbac/server/allInvitesRoutes.ts@@ -8,6 +8,7 @@ import {protectedProjectProcedure,} from "@/src/server/api/trpc";import {+ hasProjectAccessByRole,paginationZod,type Prisma,type PrismaClient,@@ -31,6 +32,9 @@ async function getInvites(| (z.infer<typeof projectLevelInviteQuery> & { orgId: string }),showAllOrgMembers = true,) {+ const rolesWithoutProjectRead = Object.values(Role).filter(+ (role) => !hasProjectAccessByRole({ role, scope: "project:read" }),+ );const where: Prisma.MembershipInvitationWhereInput = {orgId: query.orgId,// restrict to only invites with role in a project if projectId is set@@ -39,13 +43,13 @@ async function getInvites(OR: [{orgRole: {- not: Role.NONE,+ notIn: rolesWithoutProjectRead,},},{projectId: query.projectId,projectRole: {- not: Role.NONE,+ notIn: rolesWithoutProjectRead,},},],diff --git a/web/src/features/rbac/server/allMembersRoutes.ts b/web/src/features/rbac/server/allMembersRoutes.tsindex c6cf858c08..9cad89fe73 100644--- a/web/src/features/rbac/server/allMembersRoutes.ts+++ b/web/src/features/rbac/server/allMembersRoutes.ts@@ -8,6 +8,7 @@ import {protectedProjectProcedure,} from "@/src/server/api/trpc";import {+ hasProjectAccessByRole,paginationZod,type Prisma,type PrismaClient,@@ -74,12 +75,15 @@ async function getMembers(// restrict to only members with role in a project if projectId is set and showAllOrgMembers is falseif (projectId && !showAllOrgMembers) {+ const rolesWithoutProjectRead = Object.values(Role).filter(+ (role) => !hasProjectAccessByRole({ role, scope: "project:read" }),+ );conditions.push({// either org level role or project level roleOR: [{role: {- not: Role.NONE,+ notIn: rolesWithoutProjectRead,},},{@@ -87,7 +91,7 @@ async function getMembers(some: {projectId,role: {- not: Role.NONE,+ notIn: rolesWithoutProjectRead,},},},diff --git a/web/src/features/rbac/server/inviteOrganizationMember.ts b/web/src/features/rbac/server/inviteOrganizationMember.tsindex e2d7414df2..ceb4f9aaf3 100644--- a/web/src/features/rbac/server/inviteOrganizationMember.ts+++ b/web/src/features/rbac/server/inviteOrganizationMember.ts@@ -11,6 +11,7 @@ import { throwIfNoOrganizationAccess } from "@/src/features/rbac/utils/checkOrgaimport { throwIfNoProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";import { throwIfHigherProjectRole } from "@/src/features/rbac/server/throwIfHigherProjectRole";import { throwIfHigherRole } from "@/src/features/rbac/server/throwIfHigherRole";+import { requireGatewayEnabledForRole } from "@/src/features/ai-gateway/server/availability";import type { OrgAuthedContext } from "@/src/server/api/trpc";async function createProjectMembershipOrThrowIfDuplicate({@@ -160,6 +161,7 @@ export async function inviteOrganizationMember({ownRole: ctx.session.orgRole,role: input.orgRole,});+ requireGatewayEnabledForRole(input.orgId, input.orgRole);// check for entilement (project role)if (input.projectId && input.projectRole) {diff --git a/web/src/features/rbac/server/membersRouter.ts b/web/src/features/rbac/server/membersRouter.tsindex 6abef79611..ae903cf786 100644--- a/web/src/features/rbac/server/membersRouter.ts+++ b/web/src/features/rbac/server/membersRouter.ts@@ -31,6 +31,7 @@ import {} from "@/src/features/rbac/utils/checkProjectAccess";import { allMembersRoutes } from "@/src/features/rbac/server/allMembersRoutes";import { allInvitesRoutes } from "@/src/features/rbac/server/allInvitesRoutes";+import { requireGatewayEnabledForRole } from "@/src/features/ai-gateway/server/availability";import {deleteUserBoundApiKeys,deleteUserBoundApiKeysForRole,@@ -71,7 +72,7 @@ export const membersRouter = createTRPCRouter({orgRole: z.enum(Role),// in case a projectRole should be set for a specific projectprojectId: z.string().optional(),- projectRole: z.enum(Role).optional(),+ projectRole: z.enum(Role).exclude([Role.AI_GATEWAY]).optional(),}),).mutation(async ({ input, ctx }) => {@@ -275,6 +276,7 @@ export const membersRouter = createTRPCRouter({ownRole: ctx.session.orgRole,role: input.role, // new});+ requireGatewayEnabledForRole(input.orgId, input.role);throwIfHigherRole({ownRole: ctx.session.orgRole,role: membership.role, // old@@ -411,7 +413,7 @@ export const membersRouter = createTRPCRouter({orgMembershipId: z.string(),userId: z.string(),projectId: z.string(),- projectRole: z.enum(Role).nullable(),+ projectRole: z.enum(Role).exclude([Role.AI_GATEWAY]).nullable(),}),).mutation(async ({ input, ctx }) => {diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsxindex 58ac8e832b..30e228e015 100644--- a/web/src/features/settings/SettingsPage.tsx+++ b/web/src/features/settings/SettingsPage.tsx@@ -1,7 +1,10 @@-import { type ComponentProps } from "react";+import { type ComponentProps, type ReactNode } from "react";import { useRouter } from "next/router";import { useSession } from "next-auth/react";-import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";+import {+ isSettingsPageShown,+ PagedSettingsContainer,+} from "@/src/components/PagedSettingsContainer";import ContainerPage from "@/src/components/layouts/ContainerPage";import { Badge } from "@/src/components/design-system/Badge/Badge";import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";@@ -60,9 +63,7 @@ export function SettingsPage({ scope }: SettingsPageProps) {activeSlug={activeSlug}pages={pages}fullHeight={fullHeight}- sectionHeaders={{- [ORGANIZATION_SECTION]: <OrganizationSectionHeader />,- }}+ sectionHeaders={organizationSectionHeaders(organization?.id, pages)}sectionBadges={{"AI Gateway": (<Badge text="Beta" color="blue" size="sm" font="mono" />@@ -156,3 +157,16 @@ export function buildSettingsPages({return [...account, ...organization];}++/** organizationSectionHeaders labels the org section unless the selected org shows none of its pages */+function organizationSectionHeaders(+ organizationId: string | undefined,+ pages: SettingsPageEntry[],+): Record<string, ReactNode> {+ const showsOrganizationPage = pages.some(+ (page) =>+ page.section === ORGANIZATION_SECTION && isSettingsPageShown(page),+ );+ if (organizationId && !showsOrganizationPage) return {};+ return { [ORGANIZATION_SECTION]: <OrganizationSectionHeader /> };+}diff --git a/web/src/pages/api/public/scim/Users/[id].ts b/web/src/pages/api/public/scim/Users/[id].tsindex c45f770d96..f7b346d47c 100644--- a/web/src/pages/api/public/scim/Users/[id].ts+++ b/web/src/pages/api/public/scim/Users/[id].ts@@ -11,6 +11,7 @@ import { isBaseError, LangfuseConflictError } from "@langfuse/shared";import { z } from "zod";import { type NextApiRequest, type NextApiResponse } from "next";import { assertValidOwnershipChange } from "@/src/ee/features/admin-api/server/memberships";+import { requireGatewayEnabledForRole } from "@/src/features/ai-gateway/server/availability";import { getSfdcService } from "@/src/ee/features/sfdc-sync/server";import { type AuthorizationContext } from "@/src/features/auth/policy/types";import { hasEntitlementBasedOnPlan } from "@/src/features/entitlements/server";@@ -24,7 +25,7 @@ function parseScimRole(roles: unknown): Role | undefined {return undefined;}const parsed = z- .array(z.enum(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE"]))+ .array(z.enum(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE", "AI_GATEWAY"])).safeParse(roles);return parsed.success ? parsed.data[0] : undefined;}@@ -92,6 +93,7 @@ async function provisionMembership({from: current.role,to: targetRole,});+ requireGatewayEnabledForRole(orgId, targetRole);const updated = await tx.organizationMembership.update({where: { orgId_userId: { orgId, userId } },data: { role: targetRole },@@ -175,6 +177,7 @@ async function provisionMembership({from: undefined,to: roleToCreate,});+ requireGatewayEnabledForRole(orgId, roleToCreate);try {const created = await prisma.organizationMembership.create({data: { userId, orgId, role: roleToCreate },diff --git a/web/src/pages/api/public/scim/Users/index.ts b/web/src/pages/api/public/scim/Users/index.tsindex ef2870e05b..fb51449e0e 100644--- a/web/src/pages/api/public/scim/Users/index.ts+++ b/web/src/pages/api/public/scim/Users/index.ts@@ -7,6 +7,7 @@ import { z } from "zod";import { isBaseError, type Role } from "@langfuse/shared";import { auditLog } from "@/src/features/audit-logs/server";import { assertValidOwnershipChange } from "@/src/ee/features/admin-api/server/memberships";+import { requireGatewayEnabledForRole } from "@/src/features/ai-gateway/server/availability";import { getSfdcService } from "@/src/ee/features/sfdc-sync/server";import { hasEntitlementBasedOnPlan } from "@/src/features/entitlements/server";import { shadowAuth, writeScimError } from "@/src/features/public-api/server";@@ -183,14 +184,14 @@ export default async function handler(let role: Role = "NONE";if (roles && Array.isArray(roles) && roles.length > 0) {const roleSchema = z.array(- z.enum(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE"]),+ z.enum(["OWNER", "ADMIN", "MEMBER", "VIEWER", "NONE", "AI_GATEWAY"]),);const parsedRoles = roleSchema.safeParse(roles);if (!parsedRoles.success) {logger.warn("[SCIM] Invalid roles provided for user creation");return res.status(400).json({schemas: ["urn:ietf:params:scim:api:messages:2.0:Error"],- detail: `Invalid roles provided: ${JSON.stringify(roles)}, must be one of OWNER, ADMIN, MEMBER, VIEWER, NONE`,+ detail: `Invalid roles provided: ${JSON.stringify(roles)}, must be one of OWNER, ADMIN, MEMBER, VIEWER, NONE, AI_GATEWAY`,status: 400,});}@@ -205,6 +206,7 @@ export default async function handler(from: undefined,to: role,});+ requireGatewayEnabledForRole(authCheck.scope.orgId, role);// Check if user already exists. Normalize the email to lowercase to// stay consistent with the upsert below; otherwise a case-variantdiff --git a/web/src/pages/index.tsx b/web/src/pages/index.tsxindex 10e69c71f5..a6e7ac7cf8 100644--- a/web/src/pages/index.tsx+++ b/web/src/pages/index.tsx@@ -1,5 +1,7 @@import { OrganizationProjectOverview } from "@/src/features/organizations/components/OrganizationProjectOverview";+export { redirectGatewayOnlyLanding as getServerSideProps } from "@/src/features/organizations/server/redirectGatewayOnlyLanding";+export default function Home() {return <OrganizationProjectOverview />;}diff --git a/web/src/pages/organization/[organizationId]/index.tsx b/web/src/pages/organization/[organizationId]/index.tsxindex cf6cb506ad..3b29cd4706 100644--- a/web/src/pages/organization/[organizationId]/index.tsx+++ b/web/src/pages/organization/[organizationId]/index.tsx@@ -1 +1,2 @@export { OrganizationProjectOverview as default } from "@/src/features/organizations/components/OrganizationProjectOverview";+export { redirectGatewayOnlyLanding as getServerSideProps } from "@/src/features/organizations/server/redirectGatewayOnlyLanding";diff --git a/worker/src/features/in-app-agent/executeInAppAgentRun.ts b/worker/src/features/in-app-agent/executeInAppAgentRun.tsindex 9ba99b842d..e9da1a8616 100644--- a/worker/src/features/in-app-agent/executeInAppAgentRun.ts+++ b/worker/src/features/in-app-agent/executeInAppAgentRun.ts@@ -1,4 +1,4 @@-import { Role } from "@langfuse/shared";+import { hasProjectAccessByRole, type Role } from "@langfuse/shared";import { prisma } from "@langfuse/shared/src/db";import {getLangfuseAIAwsProfile,@@ -735,7 +735,8 @@ async function resolveUserProjectAccess(params: {const projectRole = projectMembership?.role ?? orgMembership.role;- if (projectRole === Role.NONE) return null;+ if (!hasProjectAccessByRole({ role: projectRole, scope: "project:read" }))+ return null;return {projectRole,