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

Fix internal server error (#7240)

Browse Source 
* fix internal server error when create items with special pk and not required other fields

* Only run validation check when validation rules exist

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Bernat Vadell
2021-08-06 18:43:45 +02:00
committed by GitHub
parent 4c074512f6
commit 2193339aef
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import { Knex } from 'knex';
import { cloneDeep, merge, uniq, uniqWith, flatten } from 'lodash';
import { cloneDeep, merge, uniq, uniqWith, flatten, isNil } from 'lodash';
import getDatabase from '../database';
import { ForbiddenException } from '../exceptions';
import { FailedValidationException } from '@directus/shared/exceptions';
@@ -188,8 +188,6 @@ export class AuthorizationService {
* Checks if the provided payload matches the configured permissions, and adds the presets to the payload.
*/
validatePayload(action: PermissionsAction, collection: string, data: Partial<Item>): Promise<Partial<Item>> {
const validationErrors: FailedValidationException[] = [];
const payload = cloneDeep(data);
let permission: Permission | undefined;
@@ -231,6 +229,9 @@ export class AuthorizationService {
const payloadWithPresets = merge({}, preset, payload);
const hasValidationRules =
isNil(permission.validation) === false && Object.keys(permission.validation ?? {}).length > 0;
const requiredColumns: SchemaOverview['collections'][string]['fields'][string][] = [];
for (const field of Object.values(this.schema.collections[collection].fields)) {
@@ -247,13 +248,12 @@ export class AuthorizationService {
}
}
if (hasValidationRules === false && requiredColumns.length === 0) {
return payloadWithPresets;
}
if (requiredColumns.length > 0) {
permission.validation =
permission.validation && Object.keys(permission.validation).length > 0
? {
_and: [permission.validation],
}
: { _and: [] };
permission.validation = hasValidationRules ? { _and: [permission.validation] } : { _and: [] };
for (const field of requiredColumns) {
if (action === 'create' && field.defaultValue === null) {
@@ -272,10 +272,12 @@ export class AuthorizationService {
}
}
const validationErrors: FailedValidationException[] = [];
validationErrors.push(
...flatten(
validatePayload(parseFilter(permission.validation || {}, this.accountability), payloadWithPresets).map(
(error) => error.details.map((details) => new FailedValidationException(details))
validatePayload(parseFilter(permission.validation!, this.accountability), payloadWithPresets).map((error) =>
error.details.map((details) => new FailedValidationException(details))
)
)
);