@wbce-d9/api 9.26.3 → 9.26.5

package/dist/services/authorization.d.ts

@@ -12,6 +12,6 @@ export declare 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>): Partial<Item>;
+    validatePayload(action: PermissionsAction, collection: string, data: Partial<Item>, keys?: PrimaryKey[]): Promise<Partial<Item>>;
     checkAccess(action: PermissionsAction, collection: string, pk: PrimaryKey | PrimaryKey[]): Promise<void>;
 }

package/dist/services/authorization.js

@@ -1,9 +1,9 @@
 import { FailedValidationException } from '@wbce-d9/exceptions';
 import { validatePayload } from '@wbce-d9/utils';
-import { cloneDeep, flatten, isArray, isNil, merge, reduce, uniq, uniqWith } from 'lodash-es';
+import { cloneDeep, flatten, isArray, isNil, merge, reduce, uniq, uniqWith, clone } from 'lodash-es';
 import { GENERATE_SPECIAL } from '../constants.js';
 import getDatabase from '../database/index.js';
-import { ForbiddenException } from '../exceptions/index.js';
+import { ForbiddenException, UnprocessableEntityException } from '../exceptions/index.js';
 import { getRelationInfo } from '../utils/get-relation-info.js';
 import { stripFunction } from '../utils/strip-function.js';
 import { ItemsService } from './items.js';
@@ -336,7 +336,7 @@ export class AuthorizationService {
     /**
      * Checks if the provided payload matches the configured permissions, and adds the presets to the payload.
      */
-    validatePayload(action, collection, data) {
+    async validatePayload(action, collection, data, keys) {
         const payload = cloneDeep(data);
         let permission;
         if (this.accountability?.admin === true) {
@@ -368,14 +368,13 @@ export class AuthorizationService {
             }
         }
         const preset = permission.presets ?? {};
+        const fields = Object.values(this.schema.collections[collection].fields);
         const payloadWithPresets = merge({}, preset, payload);
-        const fieldValidationRules = Object.values(this.schema.collections[collection].fields)
-            .map((field) => field.validation)
-            .filter((v) => v);
+        const fieldValidationRules = fields.map((field) => field.validation).filter((v) => v);
         const hasValidationRules = isNil(permission.validation) === false && Object.keys(permission.validation ?? {}).length > 0;
         const hasFieldValidationRules = fieldValidationRules && fieldValidationRules.length > 0;
         const requiredColumns = [];
-        for (const field of Object.values(this.schema.collections[collection].fields)) {
+        for (const field of fields) {
             const specials = field?.special ?? [];
             const hasGenerateSpecial = GENERATE_SPECIAL.some((name) => specials.includes(name));
             const nullable = field.nullable || hasGenerateSpecial || field.generated;
@@ -412,7 +411,64 @@ export class AuthorizationService {
             }
         }
         const validationErrors = [];
-        validationErrors.push(...flatten(validatePayload(permission.validation, payloadWithPresets).map((error) => error.details.map((details) => new FailedValidationException(details)))));
+        const payloadWithPresetsFlattened = clone(payloadWithPresets);
+        // In case the object has O2M relations, refactor it's arrays validation can 'count' on them
+        const relations = this.schema.relations.filter((relation) => {
+            return relation.related_collection === collection;
+        });
+        // Filter out 02M collections
+        const relationsToProcess = relations.filter((relation) => {
+            if (!relation.meta?.one_field)
+                return false;
+            return relation.meta.one_field in payloadWithPresets;
+        });
+        for (const relation of relationsToProcess) {
+            // Nested array of individual items
+            const fieldKey = relation.meta.one_field;
+            const field = payloadWithPresets[fieldKey];
+            if (!field || Array.isArray(field)) {
+                // if the field is already an array or is empty we do nothing
+                continue;
+            }
+            // Object w/ create/update/delete
+            // This is horribly intricated because this functions can apply to many items on updates
+            else {
+                // lets add object in create and update
+                const arrayToValidate = field.create.concat(field.update);
+                if (action == 'update') {
+                    if (typeof keys === 'undefined') {
+                        throw new UnprocessableEntityException('keys are required when updating an object');
+                    }
+                    else {
+                        // get the number of items already linked to the object
+                        const mainItemService = new ItemsService(collection, {
+                            accountability: this.accountability,
+                            knex: this.knex,
+                            schema: this.schema,
+                        });
+                        const originalItems = await mainItemService.readMany(keys);
+                        for (let i = 0; i < originalItems.length; i++) {
+                            const originalItem = originalItems[i];
+                            const emptyItemsToAdd = originalItem[fieldKey].length - field.update?.length - field.delete?.length;
+                            const finalArrayToValidate = arrayToValidate.concat(Array(emptyItemsToAdd).fill({}));
+                            // validate partial items until the last key
+                            if (i == keys.length - 1) {
+                                payloadWithPresetsFlattened[fieldKey] = finalArrayToValidate;
+                            }
+                            else {
+                                const partialItemToValidate = { fieldKey: finalArrayToValidate };
+                                validationErrors.push(...flatten(validatePayload(permission.validation, partialItemToValidate).map((error) => error.details.map((details) => new FailedValidationException(details)))));
+                            }
+                        }
+                    }
+                }
+                else {
+                    // set the payload to validate as a well formated array
+                    payloadWithPresetsFlattened[fieldKey] = arrayToValidate;
+                }
+            }
+        }
+        validationErrors.push(...flatten(validatePayload(permission.validation, payloadWithPresetsFlattened).map((error) => error.details.map((details) => new FailedValidationException(details)))));
         if (validationErrors.length > 0)
             throw validationErrors;
         return payloadWithPresets;

package/dist/services/items.js

@@ -105,7 +105,7 @@ export class ItemsService {
                 })
                 : payload;
             const payloadWithPresets = this.accountability
-                ? authorizationService.validatePayload('create', this.collection, payloadAfterHooks)
+                ? await authorizationService.validatePayload('create', this.collection, payloadAfterHooks)
                 : payloadAfterHooks;
             if (opts.preMutationException) {
                 throw opts.preMutationException;
@@ -451,7 +451,7 @@ export class ItemsService {
             await authorizationService.checkAccess('update', this.collection, keys);
         }
         const payloadWithPresets = this.accountability
-            ? authorizationService.validatePayload('update', this.collection, payloadAfterHooks)
+            ? await authorizationService.validatePayload('update', this.collection, payloadAfterHooks, keys)
             : payloadAfterHooks;
         if (opts.preMutationException) {
             throw opts.preMutationException;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wbce-d9/api",
-  "version": "9.26.3",
+  "version": "9.26.5",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -64,7 +64,7 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.316.0",
+    "@aws-sdk/client-ses": "3.363.0",
     "@godaddy/terminus": "4.12.0",
     "@rollup/plugin-alias": "5.0.0",
     "@rollup/plugin-node-resolve": "15.0.2",
@@ -143,20 +143,20 @@
     "uuid-validate": "0.0.3",
     "vm2": "^3.9.19",
     "wellknown": "0.5.0",
+    "@wbce-d9/app": "9.26.4",
+    "@wbce-d9/constants": "9.26.3",
     "@wbce-d9/exceptions": "9.26.3",
+    "@wbce-d9/extensions-sdk": "9.26.4",
     "@wbce-d9/schema": "9.26.3",
     "@wbce-d9/specs": "9.26.3",
-    "@wbce-d9/app": "9.26.3",
-    "@wbce-d9/constants": "9.26.3",
-    "@wbce-d9/extensions-sdk": "9.26.3",
-    "@wbce-d9/storage-driver-azure": "9.26.3",
     "@wbce-d9/storage": "9.26.3",
-    "@wbce-d9/storage-driver-gcs": "9.26.3",
-    "@wbce-d9/storage-driver-cloudinary": "9.26.3",
-    "@wbce-d9/storage-driver-s3": "9.26.3",
-    "@wbce-d9/storage-driver-local": "9.26.3",
+    "@wbce-d9/storage-driver-azure": "9.26.4",
+    "@wbce-d9/storage-driver-cloudinary": "9.26.4",
+    "@wbce-d9/storage-driver-gcs": "9.26.4",
+    "@wbce-d9/storage-driver-local": "9.26.4",
+    "@wbce-d9/storage-driver-s3": "9.26.5",
     "@wbce-d9/update-check": "9.26.3",
-    "@wbce-d9/utils": "9.26.3"
+    "@wbce-d9/utils": "9.27.0"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",