@directus/api 34.0.1 → 35.0.0

package/dist/packages/types/dist/index.js

@@ -0,0 +1,403 @@
+import { Type } from "../../../node_modules/.pnpm/@sinclair_typebox@0.34.41/node_modules/@sinclair/typebox/build/esm/type/type/index.js";
+import "../../../node_modules/.pnpm/@sinclair_typebox@0.34.41/node_modules/@sinclair/typebox/build/esm/index.js";
+import z$1, { z } from "zod";
+import { PERMISSION_ACTIONS } from "@directus/constants";
+
+//#region ../packages/types/dist/index.js
+const TransformationMethods = [
+	"toFormat",
+	"jpeg",
+	"png",
+	"tiff",
+	"webp",
+	"avif",
+	"resize",
+	"extend",
+	"extract",
+	"trim",
+	"rotate",
+	"flip",
+	"flop",
+	"sharpen",
+	"median",
+	"blur",
+	"flatten",
+	"gamma",
+	"negate",
+	"normalise",
+	"normalize",
+	"clahe",
+	"convolve",
+	"threshold",
+	"linear",
+	"recomb",
+	"modulate",
+	"tint",
+	"greyscale",
+	"grayscale",
+	"toColorspace",
+	"toColourspace",
+	"removeAlpha",
+	"ensureAlpha",
+	"extractChannel",
+	"bandbool"
+];
+const DatabaseClients = [
+	"mysql",
+	"postgres",
+	"cockroachdb",
+	"sqlite",
+	"oracle",
+	"mssql",
+	"redshift"
+];
+/**
+* Supported deployment provider types
+*/
+const DEPLOYMENT_PROVIDER_TYPES = ["vercel", "netlify"];
+const SplitEntrypoint = z.object({
+	app: z.string(),
+	api: z.string()
+});
+const ExtensionSandboxRequestedScopes = z.object({
+	request: z.optional(z.object({
+		urls: z.array(z.string()),
+		methods: z.array(z.union([
+			z.literal("GET"),
+			z.literal("POST"),
+			z.literal("PATCH"),
+			z.literal("PUT"),
+			z.literal("DELETE")
+		]))
+	})),
+	log: z.optional(z.object({})),
+	sleep: z.optional(z.object({}))
+});
+const ExtensionSandboxOptions = z.optional(z.object({
+	enabled: z.boolean(),
+	requestedScopes: ExtensionSandboxRequestedScopes
+}));
+const Color = Type.String({ $id: "Color" });
+const FamilyName = Type.String({ $id: "FamilyName" });
+const FontWeight = Type.String({ $id: "FontWeight" });
+const Length = Type.String({ $id: "Length" });
+const Percentage = Type.String({ $id: "Percentage" });
+const BoxShadow = Type.String({ $id: "BoxShadow" });
+const Number = Type.String({ $id: "Number" });
+const Size = Type.String({ $id: "Size" });
+const LineWidth = Type.Union([
+	Type.String(),
+	Type.Literal("thin"),
+	Type.Literal("medium"),
+	Type.Literal("thick")
+], { $id: "LineWidth" });
+const FormRules = Type.Optional(Type.Object({
+	columnGap: Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)])),
+	rowGap: Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)])),
+	field: Type.Optional(Type.Object({
+		label: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		input: Type.Optional(Type.Object({
+			background: Type.Optional(Type.Ref(Color)),
+			backgroundSubdued: Type.Optional(Type.Ref(Color)),
+			foreground: Type.Optional(Type.Ref(Color)),
+			foregroundSubdued: Type.Optional(Type.Ref(Color)),
+			borderColor: Type.Optional(Type.Ref(Color)),
+			borderColorHover: Type.Optional(Type.Ref(Color)),
+			borderColorFocus: Type.Optional(Type.Ref(Color)),
+			boxShadow: Type.Optional(Type.Ref(BoxShadow)),
+			boxShadowHover: Type.Optional(Type.Ref(BoxShadow)),
+			boxShadowFocus: Type.Optional(Type.Ref(BoxShadow)),
+			height: Type.Optional(Type.Ref(Size)),
+			padding: Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)]))
+		}))
+	}))
+}));
+const Rules = Type.Object({
+	borderRadius: Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)])),
+	borderWidth: Type.Optional(Type.Ref(LineWidth)),
+	foreground: Type.Optional(Type.Ref(Color)),
+	foregroundSubdued: Type.Optional(Type.Ref(Color)),
+	foregroundAccent: Type.Optional(Type.Ref(Color)),
+	background: Type.Optional(Type.Ref(Color)),
+	backgroundNormal: Type.Optional(Type.Ref(Color)),
+	backgroundAccent: Type.Optional(Type.Ref(Color)),
+	backgroundSubdued: Type.Optional(Type.Ref(Color)),
+	borderColor: Type.Optional(Type.Ref(Color)),
+	borderColorAccent: Type.Optional(Type.Ref(Color)),
+	borderColorSubdued: Type.Optional(Type.Ref(Color)),
+	primary: Type.Optional(Type.Ref(Color)),
+	primaryBackground: Type.Optional(Type.Ref(Color)),
+	primarySubdued: Type.Optional(Type.Ref(Color)),
+	primaryAccent: Type.Optional(Type.Ref(Color)),
+	secondary: Type.Optional(Type.Ref(Color)),
+	secondaryBackground: Type.Optional(Type.Ref(Color)),
+	secondarySubdued: Type.Optional(Type.Ref(Color)),
+	secondaryAccent: Type.Optional(Type.Ref(Color)),
+	success: Type.Optional(Type.Ref(Color)),
+	successBackground: Type.Optional(Type.Ref(Color)),
+	successSubdued: Type.Optional(Type.Ref(Color)),
+	successAccent: Type.Optional(Type.Ref(Color)),
+	warning: Type.Optional(Type.Ref(Color)),
+	warningBackground: Type.Optional(Type.Ref(Color)),
+	warningSubdued: Type.Optional(Type.Ref(Color)),
+	warningAccent: Type.Optional(Type.Ref(Color)),
+	danger: Type.Optional(Type.Ref(Color)),
+	dangerBackground: Type.Optional(Type.Ref(Color)),
+	dangerSubdued: Type.Optional(Type.Ref(Color)),
+	dangerAccent: Type.Optional(Type.Ref(Color)),
+	fonts: Type.Optional(Type.Object({
+		display: Type.Optional(Type.Object({
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		sans: Type.Optional(Type.Object({
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		serif: Type.Optional(Type.Object({
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		monospace: Type.Optional(Type.Object({
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		}))
+	})),
+	navigation: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		backgroundAccent: Type.Optional(Type.Ref(Color)),
+		borderWidth: Type.Optional(Type.Ref(LineWidth)),
+		borderColor: Type.Optional(Type.Ref(Color)),
+		project: Type.Optional(Type.Object({
+			background: Type.Optional(Type.Ref(Color)),
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			borderWidth: Type.Optional(Type.Ref(LineWidth)),
+			borderColor: Type.Optional(Type.Ref(Color))
+		})),
+		modules: Type.Optional(Type.Object({
+			background: Type.Optional(Type.Ref(Color)),
+			borderWidth: Type.Optional(Type.Ref(LineWidth)),
+			borderColor: Type.Optional(Type.Ref(Color)),
+			button: Type.Optional(Type.Object({
+				foreground: Type.Optional(Type.Ref(Color)),
+				foregroundHover: Type.Optional(Type.Ref(Color)),
+				foregroundActive: Type.Optional(Type.Ref(Color)),
+				background: Type.Optional(Type.Ref(Color)),
+				backgroundHover: Type.Optional(Type.Ref(Color)),
+				backgroundActive: Type.Optional(Type.Ref(Color))
+			}))
+		})),
+		list: Type.Optional(Type.Object({
+			icon: Type.Optional(Type.Object({
+				foreground: Type.Optional(Type.Ref(Color)),
+				foregroundHover: Type.Optional(Type.Ref(Color)),
+				foregroundActive: Type.Optional(Type.Ref(Color))
+			})),
+			foreground: Type.Optional(Type.Ref(Color)),
+			foregroundHover: Type.Optional(Type.Ref(Color)),
+			foregroundActive: Type.Optional(Type.Ref(Color)),
+			background: Type.Optional(Type.Ref(Color)),
+			backgroundHover: Type.Optional(Type.Ref(Color)),
+			backgroundActive: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			divider: Type.Object({
+				borderColor: Type.Optional(Type.Ref(Color)),
+				borderWidth: Type.Optional(Type.Ref(LineWidth))
+			})
+		}))
+	})),
+	header: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		borderWidth: Type.Optional(Type.Ref(LineWidth)),
+		borderColor: Type.Optional(Type.Ref(Color)),
+		boxShadow: Type.Optional(Type.Ref(BoxShadow)),
+		headline: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName))
+		})),
+		title: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		}))
+	})),
+	form: FormRules,
+	sidebar: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		foreground: Type.Optional(Type.Ref(Color)),
+		fontFamily: Type.Optional(Type.Ref(FamilyName)),
+		borderWidth: Type.Optional(Type.Ref(LineWidth)),
+		borderColor: Type.Optional(Type.Ref(Color)),
+		section: Type.Optional(Type.Object({
+			toggle: Type.Optional(Type.Object({
+				icon: Type.Optional(Type.Object({
+					foreground: Type.Optional(Type.Ref(Color)),
+					foregroundHover: Type.Optional(Type.Ref(Color)),
+					foregroundActive: Type.Optional(Type.Ref(Color))
+				})),
+				foreground: Type.Optional(Type.Ref(Color)),
+				foregroundHover: Type.Optional(Type.Ref(Color)),
+				foregroundActive: Type.Optional(Type.Ref(Color)),
+				background: Type.Optional(Type.Ref(Color)),
+				backgroundHover: Type.Optional(Type.Ref(Color)),
+				backgroundActive: Type.Optional(Type.Ref(Color)),
+				fontFamily: Type.Optional(Type.Ref(FamilyName)),
+				borderWidth: Type.Optional(Type.Ref(LineWidth)),
+				borderColor: Type.Optional(Type.Ref(Color))
+			})),
+			form: FormRules
+		}))
+	})),
+	public: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		foreground: Type.Optional(Type.Ref(Color)),
+		foregroundAccent: Type.Optional(Type.Ref(Color)),
+		art: Type.Optional(Type.Object({
+			background: Type.Optional(Type.Ref(Color)),
+			primary: Type.Optional(Type.Ref(Color)),
+			secondary: Type.Optional(Type.Ref(Color)),
+			speed: Type.Optional(Type.Ref(Number))
+		})),
+		form: FormRules
+	})),
+	popover: Type.Optional(Type.Object({ menu: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		borderRadius: Type.Optional(Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)]))),
+		boxShadow: Type.Optional(Type.Ref(BoxShadow))
+	})) })),
+	banner: Type.Optional(Type.Object({
+		background: Type.Optional(Type.Ref(Color)),
+		padding: Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)])),
+		borderRadius: Type.Optional(Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)]))),
+		avatar: Type.Optional(Type.Object({
+			background: Type.Optional(Type.Ref(Color)),
+			foreground: Type.Optional(Type.Ref(Color)),
+			borderRadius: Type.Optional(Type.Optional(Type.Union([Type.Ref(Length), Type.Ref(Percentage)])))
+		})),
+		headline: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		title: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		subtitle: Type.Optional(Type.Object({
+			foreground: Type.Optional(Type.Ref(Color)),
+			fontFamily: Type.Optional(Type.Ref(FamilyName)),
+			fontWeight: Type.Optional(Type.Ref(FontWeight))
+		})),
+		art: Type.Optional(Type.Object({ foreground: Type.Optional(Type.Ref(Color)) }))
+	}))
+});
+const ThemeSchema = Type.Object({
+	id: Type.String(),
+	name: Type.String(),
+	appearance: Type.Union([Type.Literal("light"), Type.Literal("dark")]),
+	rules: Rules
+});
+const Definitions = { $defs: {
+	Color,
+	FamilyName,
+	Length,
+	Percentage,
+	LineWidth,
+	BoxShadow,
+	Size,
+	Number
+} };
+/**
+* Indicates the kind of change based on comparisons by deep-diff package
+*/
+const DiffKind = {
+	NEW: "N",
+	DELETE: "D",
+	EDIT: "E",
+	ARRAY: "A"
+};
+let UserIntegrityCheckFlag = /* @__PURE__ */ function(UserIntegrityCheckFlag$1) {
+	UserIntegrityCheckFlag$1[UserIntegrityCheckFlag$1["None"] = 0] = "None";
+	/** Check if the number of remaining admin users is greater than 0 */
+	UserIntegrityCheckFlag$1[UserIntegrityCheckFlag$1["RemainingAdmins"] = 1] = "RemainingAdmins";
+	/** Check if the number of users is within the limits */
+	UserIntegrityCheckFlag$1[UserIntegrityCheckFlag$1["UserLimits"] = 2] = "UserLimits";
+	UserIntegrityCheckFlag$1[UserIntegrityCheckFlag$1["All"] = 3] = "All";
+	return UserIntegrityCheckFlag$1;
+}({});
+const zodStringOrNumber = z.union([z.string(), z.number()]);
+const WebSocketMessage = z.object({
+	type: z.string(),
+	uid: zodStringOrNumber.optional()
+}).passthrough();
+const TYPE = { COLLAB: "collab" };
+const COLLAB_BUS = "collab";
+const COLORS = [
+	"purple",
+	"pink",
+	"blue",
+	"green",
+	"yellow",
+	"orange",
+	"red"
+];
+const ACTION = {
+	CLIENT: {
+		JOIN: "join",
+		LEAVE: "leave",
+		UPDATE: "update",
+		UPDATE_ALL: "updateAll",
+		FOCUS: "focus",
+		DISCARD: "discard"
+	},
+	SERVER: {
+		INIT: "init",
+		JOIN: "join",
+		LEAVE: "leave",
+		SAVE: "save",
+		DELETE: "delete",
+		UPDATE: "update",
+		FOCUS: "focus",
+		DISCARD: "discard",
+		ERROR: "error"
+	}
+};
+const BaseClientMessage = z$1.object({
+	type: z$1.literal(TYPE.COLLAB),
+	room: z$1.string()
+});
+const ClientMessage = z$1.discriminatedUnion("action", [
+	z$1.object({
+		type: z$1.literal(TYPE.COLLAB),
+		action: z$1.literal(ACTION.CLIENT.JOIN),
+		collection: z$1.string(),
+		item: z$1.union([z$1.string(), z$1.number()]).nullable(),
+		version: z$1.string().nullable(),
+		color: z$1.enum(COLORS).nullable().optional(),
+		initialChanges: z$1.record(z$1.string(), z$1.any()).optional()
+	}),
+	BaseClientMessage.extend({ action: z$1.literal(ACTION.CLIENT.LEAVE) }),
+	BaseClientMessage.extend({
+		action: z$1.literal(ACTION.CLIENT.UPDATE),
+		field: z$1.string(),
+		changes: z$1.unknown().optional()
+	}),
+	BaseClientMessage.extend({
+		action: z$1.literal(ACTION.CLIENT.UPDATE_ALL),
+		changes: z$1.record(z$1.string(), z$1.any()).optional()
+	}),
+	BaseClientMessage.extend({
+		action: z$1.literal(ACTION.CLIENT.FOCUS),
+		field: z$1.string().nullable()
+	}),
+	BaseClientMessage.extend({ action: z$1.literal(ACTION.CLIENT.DISCARD) })
+]);
+
+//#endregion
+export { ACTION, COLLAB_BUS, COLORS, ClientMessage, DEPLOYMENT_PROVIDER_TYPES, DatabaseClients, DiffKind, TYPE, TransformationMethods, UserIntegrityCheckFlag, WebSocketMessage };

package/dist/permissions/cache.js

@@ -1,28 +1,31 @@
-import { useEnv } from '@directus/env';
-import { defineCache } from '@directus/memory';
-import { redisConfigAvailable, useRedis } from '../redis/index.js';
-import { getMilliseconds } from '../utils/get-milliseconds.js';
+import { useRedis } from "../redis/lib/use-redis.js";
+import { redisConfigAvailable } from "../redis/utils/redis-config-available.js";
+import "../redis/index.js";
+import { getMilliseconds } from "../utils/get-milliseconds.js";
+import { useEnv } from "@directus/env";
+import { defineCache } from "@directus/memory";
+
+//#region src/permissions/cache.ts
 const localOnly = redisConfigAvailable() === false;
 const env = useEnv();
-const ttl = getMilliseconds(env['CACHE_SYSTEM_TTL']);
-const config = localOnly
-    ? {
-        type: 'local',
-        maxKeys: 500,
-    }
-    : {
-        type: 'multi',
-        redis: {
-            namespace: 'permissions',
-            redis: useRedis(),
-            ...(ttl !== undefined ? { ttl } : {}),
-        },
-        local: {
-            maxKeys: 100,
-        },
-    };
-export const useCache = defineCache(config);
-export function clearCache() {
-    const cache = useCache();
-    return cache.clear();
+const ttl = getMilliseconds(env["CACHE_SYSTEM_TTL"]);
+const config = localOnly ? {
+	type: "local",
+	maxKeys: 500
+} : {
+	type: "multi",
+	redis: {
+		namespace: env["REDIS_PERMISSIONS_NAMESPACE"] ?? "permissions",
+		redis: useRedis(),
+		...ttl !== undefined ? { ttl } : {}
+	},
+	local: { maxKeys: 100 }
+};
+const useCache = defineCache(config);
+function clearCache() {
+	const cache = useCache();
+	return cache.clear();
 }
+
+//#endregion
+export { clearCache, useCache };

package/dist/permissions/lib/fetch-permissions.js

@@ -1,27 +1,34 @@
-import { extractRequiredDynamicVariableContextForPermissions } from '../utils/extract-required-dynamic-variable-context.js';
-import { fetchDynamicVariableData } from '../utils/fetch-dynamic-variable-data.js';
-import { fetchRawPermissions } from '../utils/fetch-raw-permissions.js';
-import { getPermissionsForShare } from '../utils/get-permissions-for-share.js';
-import { processPermissions } from '../utils/process-permissions.js';
-export async function fetchPermissions(options, context) {
-    const permissions = await fetchRawPermissions({ ...options, bypassMinimalAppPermissions: options.bypassDynamicVariableProcessing ?? false }, context);
-    if (options.accountability && !options.bypassDynamicVariableProcessing) {
-        const dynamicVariableContext = extractRequiredDynamicVariableContextForPermissions(permissions);
-        const permissionsContext = await fetchDynamicVariableData({
-            accountability: options.accountability,
-            policies: options.policies,
-            dynamicVariableContext,
-        }, context);
-        // Replace dynamic variables with their actual values
-        const processedPermissions = processPermissions({
-            permissions,
-            accountability: options.accountability,
-            permissionsContext,
-        });
-        if (options.accountability.share && (options.action === undefined || options.action === 'read')) {
-            return await getPermissionsForShare(options.accountability, options.collections, context);
-        }
-        return processedPermissions;
-    }
-    return permissions;
+import { extractRequiredDynamicVariableContextForPermissions } from "../utils/extract-required-dynamic-variable-context.js";
+import { fetchDynamicVariableData } from "../utils/fetch-dynamic-variable-data.js";
+import { fetchRawPermissions } from "../utils/fetch-raw-permissions.js";
+import { getPermissionsForShare } from "../utils/get-permissions-for-share.js";
+import { processPermissions } from "../utils/process-permissions.js";
+
+//#region src/permissions/lib/fetch-permissions.ts
+async function fetchPermissions(options, context) {
+	const permissions = await fetchRawPermissions({
+		...options,
+		bypassMinimalAppPermissions: options.bypassDynamicVariableProcessing ?? false
+	}, context);
+	if (options.accountability && !options.bypassDynamicVariableProcessing) {
+		const dynamicVariableContext = extractRequiredDynamicVariableContextForPermissions(permissions);
+		const permissionsContext = await fetchDynamicVariableData({
+			accountability: options.accountability,
+			policies: options.policies,
+			dynamicVariableContext
+		}, context);
+		const processedPermissions = processPermissions({
+			permissions,
+			accountability: options.accountability,
+			permissionsContext
+		});
+		if (options.accountability.share && (options.action === undefined || options.action === "read")) {
+			return await getPermissionsForShare(options.accountability, options.collections, context);
+		}
+		return processedPermissions;
+	}
+	return permissions;
 }
+
+//#endregion
+export { fetchPermissions };

package/dist/permissions/lib/fetch-policies.js

@@ -1,43 +1,44 @@
-import { filterPoliciesByIp } from '../utils/filter-policies-by-ip.js';
-import { withCache } from '../utils/with-cache.js';
-export const fetchPolicies = withCache('policies', _fetchPolicies, ({ roles, user, ip }) => ({ roles, user, ip }));
+import { withCache } from "../utils/with-cache.js";
+import { filterPoliciesByIp } from "../utils/filter-policies-by-ip.js";
+
+//#region src/permissions/lib/fetch-policies.ts
+const fetchPolicies = withCache("policies", _fetchPolicies, ({ roles, user, ip }) => ({
+	roles,
+	user,
+	ip
+}));
 /**
- * Fetch the policies associated with the current user accountability
- */
-export async function _fetchPolicies({ roles, user, ip }, context) {
-    const { AccessService } = await import('../../services/access.js');
-    const accessService = new AccessService(context);
-    let roleFilter;
-    if (roles.length === 0) {
-        // Users without role assumes the Public role permissions along with their attached policies
-        roleFilter = { _and: [{ role: { _null: true } }, { user: { _null: true } }] };
-    }
-    else {
-        roleFilter = { role: { _in: roles } };
-    }
-    // If the user is not null, we also want to include the policies attached to the user
-    const filter = user ? { _or: [{ user: { _eq: user } }, roleFilter] } : roleFilter;
-    const accessRows = (await accessService.readByQuery({
-        filter,
-        fields: ['policy.id', 'policy.ip_access', 'role'],
-        limit: -1,
-    }));
-    const filteredAccessRows = filterPoliciesByIp(accessRows, ip);
-    /*
-     * Sort rows by priority (goes bottom up):
-     * - Parent role policies
-     * - Child role policies
-     * - User policies
-     */
-    filteredAccessRows.sort((a, b) => {
-        if (!a.role && !b.role)
-            return 0;
-        if (!a.role)
-            return 1;
-        if (!b.role)
-            return -1;
-        return roles.indexOf(a.role) - roles.indexOf(b.role);
-    });
-    const ids = filteredAccessRows.map(({ policy }) => policy.id);
-    return ids;
+* Fetch the policies associated with the current user accountability
+*/
+async function _fetchPolicies({ roles, user, ip }, context) {
+	const { AccessService } = await import("../../services/access.js");
+	const accessService = new AccessService(context);
+	let roleFilter;
+	if (roles.length === 0) {
+		roleFilter = { _and: [{ role: { _null: true } }, { user: { _null: true } }] };
+	} else {
+		roleFilter = { role: { _in: roles } };
+	}
+	const filter = user ? { _or: [{ user: { _eq: user } }, roleFilter] } : roleFilter;
+	const accessRows = await accessService.readByQuery({
+		filter,
+		fields: [
+			"policy.id",
+			"policy.ip_access",
+			"role"
+		],
+		limit: -1
+	});
+	const filteredAccessRows = filterPoliciesByIp(accessRows, ip);
+	filteredAccessRows.sort((a, b) => {
+		if (!a.role && !b.role) return 0;
+		if (!a.role) return 1;
+		if (!b.role) return -1;
+		return roles.indexOf(a.role) - roles.indexOf(b.role);
+	});
+	const ids = filteredAccessRows.map(({ policy }) => policy.id);
+	return ids;
 }
+
+//#endregion
+export { _fetchPolicies, fetchPolicies };

package/dist/permissions/lib/fetch-roles-tree.js

@@ -1,6 +1,11 @@
-import { fetchRolesTree as _fetchRolesTree } from '@directus/utils/node';
-import { withCache } from '../utils/with-cache.js';
+import { withCache } from "../utils/with-cache.js";
+import { fetchRolesTree as fetchRolesTree$1 } from "@directus/utils/node";
+
+//#region src/permissions/lib/fetch-roles-tree.ts
 /**
- * Fetches the roles tree starting from a specific role.
- */
-export const fetchRolesTree = withCache('roles-tree', _fetchRolesTree, (start) => ({ start }));
+* Fetches the roles tree starting from a specific role.
+*/
+const fetchRolesTree = withCache("roles-tree", fetchRolesTree$1, (start) => ({ start }));
+
+//#endregion
+export { fetchRolesTree };

package/dist/permissions/lib/with-app-minimal-permissions.js

@@ -1,10 +1,15 @@
-import { appAccessMinimalPermissions } from '@directus/system-data';
-import { cloneDeep } from 'lodash-es';
-import { filterItems } from '../../utils/filter-items.js';
-export function withAppMinimalPermissions(accountability, permissions, filter) {
-    if (accountability?.app === true) {
-        const filteredAppMinimalPermissions = cloneDeep(filterItems(appAccessMinimalPermissions, filter));
-        return [...permissions, ...filteredAppMinimalPermissions];
-    }
-    return permissions;
+import { filterItems } from "../../utils/filter-items.js";
+import { cloneDeep } from "lodash-es";
+import { appAccessMinimalPermissions } from "@directus/system-data";
+
+//#region src/permissions/lib/with-app-minimal-permissions.ts
+function withAppMinimalPermissions(accountability, permissions, filter) {
+	if (accountability?.app === true) {
+		const filteredAppMinimalPermissions = cloneDeep(filterItems(appAccessMinimalPermissions, filter));
+		return [...permissions, ...filteredAppMinimalPermissions];
+	}
+	return permissions;
 }
+
+//#endregion
+export { withAppMinimalPermissions };