Merge branch 'main' into feature-redis-cache

api/src/services/authorization.ts

@@ -16,6 +16,7 @@ import { ForbiddenException, InvalidPayloadException } from '../exceptions';
 import { uniq, merge } from 'lodash';
 import generateJoi from '../utils/generate-joi';
 import ItemsService from './items';
+import { parseFilter } from '../utils/parse-filter';
 
 export default class AuthorizationService {
 	knex: Knex;
@@ -64,8 +65,7 @@ export default class AuthorizationService {
 		}
 
 		validateFields(ast);
-
-		applyFilters(ast);
+		applyFilters(ast, this.accountability);
 
 		return ast;
 
@@ -126,7 +126,8 @@ export default class AuthorizationService {
 		}
 
 		function applyFilters(
-			ast: AST | NestedCollectionAST | FieldAST
+			ast: AST | NestedCollectionAST | FieldAST,
+			accountability: Accountability | null
 		): AST | NestedCollectionAST | FieldAST {
 			if (ast.type === 'collection') {
 				const collection = ast.name;
@@ -136,11 +137,12 @@ export default class AuthorizationService {
 					(permission) => permission.collection === collection
 				)!;
 
+				const parsedPermissions = parseFilter(permissions.permissions, accountability);
+
 				ast.query = {
 					...ast.query,
 					filter: {
-						...(ast.query.filter || {}),
-						...permissions.permissions,
+						_and: [ast.query.filter || {}, parsedPermissions],
 					},
 				};
 
@@ -155,7 +157,10 @@ export default class AuthorizationService {
 					ast.query.limit = permissions.limit;
 				}
 
-				ast.children = ast.children.map(applyFilters) as (NestedCollectionAST | FieldAST)[];
+				ast.children = ast.children.map((child) => applyFilters(child, accountability)) as (
+					| NestedCollectionAST
+					| FieldAST
+				)[];
 			}
 
 			return ast;

api/src/services/collections.ts

@@ -199,12 +199,27 @@ export default class CollectionsService {
 			const payload = data as Partial<Collection>;
 
 			if (!payload.meta) {
-				throw new InvalidPayloadException(`"system" key is required`);
+				throw new InvalidPayloadException(`"meta" key is required`);
 			}
 
-			return (await collectionItemsService.update(payload.meta!, key as any)) as
-				| string
-				| string[];
+			const keys = Array.isArray(key) ? key : [key];
+
+			for (const key of keys) {
+				const exists =
+					(await this.knex
+						.select('collection')
+						.from('directus_collections')
+						.where({ collection: key })
+						.first()) !== undefined;
+
+				if (exists) {
+					await collectionItemsService.update(payload.meta, key);
+				} else {
+					await collectionItemsService.create({ ...payload.meta, collection: key });
+				}
+			}
+
+			return key;
 		}
 
 		const payloads = Array.isArray(data) ? data : [data];

api/src/services/fields.ts

@@ -253,16 +253,23 @@ export default class FieldsService {
 				.from('directus_fields')
 				.where({ collection, field: field.field })
 				.first();
-			if (!record) throw new FieldNotFoundException(collection, field.field);
 
-			await this.itemsService.update(
-				{
+			if (record) {
+				await this.itemsService.update(
+					{
+						...field.meta,
+						collection: collection,
+						field: field.field,
+					},
+					record.id
+				);
+			} else {
+				await this.itemsService.create({
 					...field.meta,
 					collection: collection,
 					field: field.field,
-				},
-				record.id
-			);
+				});
+			}
 		}
 
 		return field.field;

api/src/services/payload.ts

@@ -321,4 +321,3 @@ export default class PayloadService {
 		}
 	}
 }
-0;