github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-02 10:25:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve recursive filtering (#4493)

Browse Source 
* Use lowercase chars only

* Fix join alias mapping

* Pass keys as array in delete

* Cleanup delete controller

* Don't catch unexpected errors
This commit is contained in:
Rijk van Zanten
2021-03-11 17:56:04 -05:00
committed by GitHub
parent 7bd5dc5c9f
commit b613ce1d18
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/services/authorization.ts
View File

@@ -334,21 +334,13 @@ export class AuthorizationService {
schema: this.schema,
});
try {
const query: Query = {
fields: ['*'],
};
const query: Query = {
fields: ['*'],
};
const result = await itemsService.readByKey(pk as any, query, action);
const result = await itemsService.readByKey(pk as any, query, action);
if (!result) throw '';
if (Array.isArray(pk) && pk.length > 1 && result.length !== pk.length) throw '';
} catch {
throw new ForbiddenException(`You're not allowed to ${action} item "${pk}" in collection "${collection}".`, {
collection,
item: pk,
action,
});
}
if (!result) throw new ForbiddenException();
if (Array.isArray(pk) && pk.length > 1 && result.length !== pk.length) throw new ForbiddenException();
}
}

3
api/src/services/items.ts
View File

@@ -217,6 +217,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
action: PermissionsAction = 'read'
): Promise<null | Partial<Item> | Partial<Item>[]> {
query = clone(query);
const primaryKeyField = this.schema.tables[this.collection].primary;
const keys = toArray(key);
@@ -474,7 +475,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
schema: this.schema,
});
await authorizationService.checkAccess('delete', this.collection, key);
await authorizationService.checkAccess('delete', this.collection, keys);
}
await emitter.emitAsync(`${this.eventScope}.delete.before`, {