Fixed validators (#10543)

EtherealEngine · Aug 16, 2024 · 97044a8 · 97044a8
1 parent 09a2269
commit 97044a8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/packages/common/src/schemas/media/file-browser.schema.ts b/packages/common/src/schemas/media/file-browser.schema.ts
@@ -84,7 +84,8 @@ export const fileBrowserPatchSchema = Type.Intersect(
       project: Type.String(),
       body: Type.Any(), // Buffer | string
       contentType: Type.Optional(Type.String()),
-      storageProviderName: Type.Optional(Type.String())
+      storageProviderName: Type.Optional(Type.String()),
+      fileName: Type.Optional(Type.String())
     })
   ],
   {

diff --git a/packages/common/src/schemas/media/invalidation.schema.ts b/packages/common/src/schemas/media/invalidation.schema.ts
@@ -48,7 +48,7 @@ export const invalidationSchema = Type.Object(
 export interface InvalidationType extends Static<typeof invalidationSchema> {}
 
 // Schema for creating new entries
-export const invalidationDataSchema = Type.Partial(invalidationSchema, { $id: 'InvalidationData' })
+export const invalidationDataSchema = Type.Pick(invalidationSchema, ['path'], { $id: 'InvalidationData' })
 export interface InvalidationData extends Static<typeof invalidationDataSchema> {}
 
 // Schema for allowed query properties

diff --git a/packages/server-core/src/media/file-browser/file-browser.hooks.ts b/packages/server-core/src/media/file-browser/file-browser.hooks.ts
@@ -45,13 +45,13 @@ export default {
         return context
       }
     ],
-    update: [() => schemaHooks.validateData(fileBrowserUpdateValidator)],
+    update: [schemaHooks.validateData(fileBrowserUpdateValidator)],
     patch: [
       (context) => {
         context[SYNC] = false
         return context
       },
-      () => schemaHooks.validateData(fileBrowserPatchValidator)
+      schemaHooks.validateData(fileBrowserPatchValidator)
     ],
     remove: []
   },

diff --git a/packages/server-core/src/media/invalidation/invalidation.hooks.ts b/packages/server-core/src/media/invalidation/invalidation.hooks.ts
@@ -45,15 +45,12 @@ export default {
   before: {
     all: [
       disallow('external'),
-      () => schemaHooks.validateQuery(invalidationQueryValidator),
+      schemaHooks.validateQuery(invalidationQueryValidator),
       schemaHooks.resolveQuery(invalidationQueryResolver)
     ],
     find: [],
     get: [],
-    create: [
-      () => schemaHooks.validateData(invalidationDataValidator),
-      schemaHooks.resolveData(invalidationDataResolver)
-    ],
+    create: [schemaHooks.validateData(invalidationDataValidator), schemaHooks.resolveData(invalidationDataResolver)],
     update: [disallow()],
     patch: [disallow()],
     remove: []