codehooks-js 1.2.11 → 1.2.13

package/crudlify/index.mjs

@@ -206,14 +206,14 @@ async function updateFunc(req, res) {
         }        
         const document = req.body;
         delete document._id; // avoid schema validation error
-        console.log(req.headers['x-real-ip'], req.method, req.originalUrl, _schema[collection]);
+        console.log(req.headers['x-real-ip'], req.method, req.originalUrl);
         if (_schema[collection] != null) {
             _validate(_schema[collection], document, _opt)
                 .then(async function (value) {
                     document._id = ID; // put back id that was removed for validation
                     const conn = await Datastore.open();
                     await _eventHooks.fireBefore(collection, 'PUT', document);
-                    const result = await conn.replaceOne(collection, ID, document, {});
+                    const result = await conn.replaceOne(collection, ID, document, {});                    
                     await _eventHooks.fireAfter(collection, 'PUT', result);
                     res.json(result);
                 })
@@ -225,15 +225,20 @@ async function updateFunc(req, res) {
             document._id = ID; // put back id that was removed for validation
             const conn = await Datastore.open();
             await _eventHooks.fireBefore(collection, 'PUT', document);
-            const result = await conn.replaceOne(collection, ID, document, {});
+            const result = await conn.replaceOne(collection, ID, document, {});            
             await _eventHooks.fireAfter(collection, 'PUT', result);
             res.json(result);
         }
     } catch (e) {
-        console.error(e.message)
-        res
+        if (e.schemaError) {
+            res
+            .status(400) // validator
+            .end(e);
+        } else {
+            res
             .status(404) // not found
             .end(e.message);
+        }  
     }
 }
 
@@ -251,11 +256,16 @@ async function patchFunc(req, res) {
         const result = await conn.updateOne(collection, ID, document, {});
         await _eventHooks.fireAfter(collection, 'PATCH', document);
         res.json(result);
-    } catch (e) {
-        
-        res
+    } catch (e) {        
+        if (e.schemaError) {
+            res
+            .status(400) // validator
+            .end(e);
+        } else {
+            res
             .status(404) // not found
             .end(e.message);
+        }        
     }
 }
 
@@ -277,9 +287,15 @@ async function patchManyFunc(req, res) {
         await _eventHooks.fireAfter(collection, 'PATCH', result);
         res.json(result);
     } catch (e) {
-        res
+        if (e.schemaError) {
+            res
+            .status(400) // validator
+            .end(e);
+        } else {
+            res
             .status(404) // not found
             .end(e.message);
+        }
     }
 }
 

package/crudlify/lib/schema/yup/index.mjs

@@ -2,8 +2,21 @@ const debug = console.debug;
 
 export const validate = (schema, document) => {
     debug('Validate Yup', document, schema)
-    if (schema == null) return true;
-    return schema.validate(document)
+    return new Promise(async (resolve, reject) => {
+        if (schema == null) {
+            debug('Null validator')
+            resolve(true)
+        }
+        const valid = await schema.validate(document);
+        
+        if (valid) {
+            debug('Validate ok', valid)
+            resolve(valid)
+        } else {
+            debug('Validate error', valid)
+            resolve(valid)
+        }
+    });    
 }
 
 export const cast = (schema, document) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codehooks-js",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "type": "module",
   "description": "Codehooks.io official library - provides express.JS like syntax",
   "main": "index.js",